merge in lmp-mr1-release history after reset to ea2b5836f86a9fda6730e680f063370b9e3a1ef9
authorThe Android Automerger <android-build@google.com>
Wed, 29 Oct 2014 13:10:45 +0000 (06:10 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 29 Oct 2014 13:10:45 +0000 (06:10 -0700)
commitfde9cbad5381a3b48180887e7925492a35e69441
treee66180d6dca2f781215dbfd2b603cd5d8858fd0e
parentea2b5836f86a9fda6730e680f063370b9e3a1ef9
parentb6f841414dbc4df0bb431860eef657198a13d22d
merge in lmp-mr1-release history after reset to ea2b5836f86a9fda6730e680f063370b9e3a1ef9