OSDN Git Service

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

Trivial merge