merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Mon, 2 Sep 2013 13:01:25 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 2 Sep 2013 13:01:25 +0000 (06:01 -0700)

Trivial merge