merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Tue, 15 Oct 2013 22:55:44 +0000 (15:55 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 15 Oct 2013 22:55:44 +0000 (15:55 -0700)

Trivial merge