OSDN Git Service

merge in lmp-mr1-release history after reset to 33bbe435b41e4eead73b775346ecb0e5e8b6c8a9
authorThe Android Automerger <android-build@google.com>
Thu, 9 Oct 2014 13:11:12 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 9 Oct 2014 13:11:12 +0000 (06:11 -0700)

Trivial merge