OSDN Git Service

merge in klp-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Thu, 27 Jun 2013 14:08:35 +0000 (07:08 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 27 Jun 2013 14:08:35 +0000 (07:08 -0700)

Trivial merge