OSDN Git Service

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

Trivial merge