OSDN Git Service

merge in klp-mr2-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Wed, 12 Mar 2014 13:00:23 +0000 (06:00 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 12 Mar 2014 13:00:23 +0000 (06:00 -0700)

Trivial merge