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

This commit is contained in:
The Android Automerger 2014-09-22 11:14:20 -07:00
commit d57a5b0cb8

Diff Content Not Available