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

This commit is contained in:
The Android Automerger 2014-10-01 06:09:15 -07:00
commit dd4b377612

Diff Content Not Available