merge in lmp-mr1-release history after reset to 131866e1a4

This commit is contained in:
The Android Automerger 2014-10-27 06:10:26 -07:00
commit 815dcee07a

Diff Content Not Available