OSDN Git Service

merge in klp-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 6 Aug 2013 15:17:33 +0000 (08:17 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 6 Aug 2013 15:17:33 +0000 (08:17 -0700)

Trivial merge