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

This commit is contained in:
The Android Automerger 2014-09-29 06:09:50 -07:00
commit e09a9d77d2

Diff Content Not Available