OSDN Git Service

merge in klp-mr1-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Wed, 13 Nov 2013 01:24:10 +0000 (17:24 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 13 Nov 2013 01:24:10 +0000 (17:24 -0800)

Trivial merge