tree 985937655234bf0f48cecb36793fac846911244f
parent ffd4fee911ee43fbec7b08b829d15a7593421dba
parent 6a853773669ff450a2e684577b8c73b3b00d6e28
author The Android Automerger <android-build@google.com> 1424138426 -0800
committer The Android Automerger <android-build@google.com> 1424138426 -0800

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