merge in lmp-release history after reset to e229678c0502930303de5dfdb939c0214a67d151
authorThe Android Automerger <android-build@google.com>
Tue, 26 Aug 2014 13:12:15 +0000 (06:12 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 26 Aug 2014 13:12:15 +0000 (06:12 -0700)
commit8749ce8258df5e085a2f68369d7b2b2a849550b2
treed5bd3ddf43ba3ae0d1b316873f0d0428ca563450
parente229678c0502930303de5dfdb939c0214a67d151
parente37f6efdb77437074e2507ebb8ca28e315169e3f
merge in lmp-release history after reset to e229678c0502930303de5dfdb939c0214a67d151