merge in lmp-mr1-release history after reset to b1982b75c4

This commit is contained in:
The Android Automerger 2014-09-22 11:44:59 -07:00
commit 68ff95aad4

Diff Content Not Available