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

This commit is contained in:
The Android Automerger 2014-09-22 10:18:17 -07:00
commit 0c263b041c

Diff Content Not Available