OSDN Git Service

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

Trivial merge