merge in lmp-release history after reset to 028c01ae3f18f11dbc59e980b41d19ce9679501a
The Android Automerger [Sat, 6 Sep 2014 15:51:57 +0000 (08:51 -0700)]

Trivial merge