OSDN Git Service

merge in klp-mr1-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Mon, 28 Oct 2013 13:02:16 +0000 (06:02 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 28 Oct 2013 13:02:16 +0000 (06:02 -0700)

Trivial merge