OSDN Git Service

merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Wed, 4 Mar 2015 23:18:42 +0000 (15:18 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 4 Mar 2015 23:18:42 +0000 (15:18 -0800)

Trivial merge