merge in lmp-release history after reset to lmp-dev

This commit is contained in:
The Android Automerger 2014-08-26 11:15:15 -07:00
commit 07e1169537

Diff Content Not Available