OSDN Git Service

merge in klp-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 30 Jul 2013 18:08:39 +0000 (11:08 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 30 Jul 2013 18:08:39 +0000 (11:08 -0700)

Trivial merge