OSDN Git Service

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

Trivial merge