merge in lmp-mr1-release history after reset to ea2b5836f86a9fda6730e680f063370b9e3a1ef9
authorThe Android Automerger <android-build@google.com>
Tue, 28 Oct 2014 13:14:00 +0000 (06:14 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 28 Oct 2014 13:14:00 +0000 (06:14 -0700)
commitb6f841414dbc4df0bb431860eef657198a13d22d
treee66180d6dca2f781215dbfd2b603cd5d8858fd0e
parentea2b5836f86a9fda6730e680f063370b9e3a1ef9
parentb8b5ad113f7050ae2a21f5d3806d8226e19cf454
merge in lmp-mr1-release history after reset to ea2b5836f86a9fda6730e680f063370b9e3a1ef9