OSDN Git Service

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

Trivial merge