OSDN Git Service

merge in lmp-mr1-release history after reset to 11e8b23202a67ea1f82e5db6a113087c54be480b
authorThe Android Automerger <android-build@google.com>
Tue, 23 Sep 2014 22:15:52 +0000 (15:15 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 23 Sep 2014 22:15:52 +0000 (15:15 -0700)

Trivial merge