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

Trivial merge