merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Wed, 3 Dec 2014 14:10:36 +0000 (06:10 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 3 Dec 2014 14:10:36 +0000 (06:10 -0800)

Trivial merge