OSDN Git Service

merge in lmp-mr1-release history after reset to a26143546e4665cc3b07d6527b63a2e4bb04fb9f
authorThe Android Automerger <android-build@google.com>
Sat, 8 Nov 2014 14:12:55 +0000 (06:12 -0800)
committerThe Android Automerger <android-build@google.com>
Sat, 8 Nov 2014 14:12:55 +0000 (06:12 -0800)

Trivial merge