merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Thu, 8 Jan 2015 17:33:11 +0000 (09:33 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 8 Jan 2015 17:33:11 +0000 (09:33 -0800)

Trivial merge