OSDN Git Service

merge in klp-mr1-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Mon, 11 Nov 2013 18:50:07 +0000 (10:50 -0800)
committerThe Android Automerger <android-build@google.com>
Mon, 11 Nov 2013 18:50:07 +0000 (10:50 -0800)

Trivial merge