OSDN Git Service

merge in klp-mr2-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Thu, 6 Mar 2014 14:00:19 +0000 (06:00 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 6 Mar 2014 14:00:19 +0000 (06:00 -0800)

Trivial merge