OSDN Git Service

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

Trivial merge