merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Thu, 5 Feb 2015 14:13:32 +0000 (06:13 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 5 Feb 2015 14:13:32 +0000 (06:13 -0800)

Trivial merge