OSDN Git Service

merge in klp-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 16 Jul 2013 13:01:56 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 16 Jul 2013 13:01:56 +0000 (06:01 -0700)

Trivial merge