OSDN Git Service

merge in lmp-mr1-release history after reset to 93176114cf34c9874c2db70fd7665e9f95dda9d0
authorThe Android Automerger <android-build@google.com>
Sat, 4 Oct 2014 13:11:10 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 4 Oct 2014 13:11:10 +0000 (06:11 -0700)

Trivial merge