OSDN Git Service

merge in lmp-mr1-release history after reset to 811a8bd72a4530d5a359e4879b80ae73682b7d6d
authorThe Android Automerger <android-build@google.com>
Sun, 28 Sep 2014 13:10:52 +0000 (06:10 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 28 Sep 2014 13:10:52 +0000 (06:10 -0700)

Trivial merge