merge in lmp-release history after reset to a02e9484be

This commit is contained in:
The Android Automerger 2014-08-02 06:09:52 -07:00
commit e152f63968

Diff Content Not Available