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

This commit is contained in:
The Android Automerger 2014-10-09 06:08:53 -07:00
commit d67e1d8ae9

Diff Content Not Available