OSDN Git Service

merge in lmp-mr1-release history after reset to 106e582053121f1934c33a6c98d35377e8ae384a
authorThe Android Automerger <android-build@google.com>
Thu, 6 Nov 2014 14:13:44 +0000 (06:13 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 6 Nov 2014 14:13:44 +0000 (06:13 -0800)

Trivial merge