OSDN Git Service

merge in klp-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Wed, 7 Aug 2013 13:00:48 +0000 (06:00 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 7 Aug 2013 13:00:48 +0000 (06:00 -0700)

Trivial merge