merge in lmp-release history after reset to e229678c0502930303de5dfdb939c0214a67d151
authorThe Android Automerger <android-build@google.com>
Sat, 23 Aug 2014 13:11:11 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 23 Aug 2014 13:11:11 +0000 (06:11 -0700)
commit69bf9961882a5a61b85c72df540a7ec8112a6704
treed5bd3ddf43ba3ae0d1b316873f0d0428ca563450
parente229678c0502930303de5dfdb939c0214a67d151
parentf19afcfb74b5ff1c505ef6562e9c3d65fd1c6200
merge in lmp-release history after reset to e229678c0502930303de5dfdb939c0214a67d151