merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Wed, 3 Dec 2014 14:10:25 +0000 (06:10 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 3 Dec 2014 14:10:25 +0000 (06:10 -0800)
commit61fd1af3488f2e1503aa1aeb92ca53fc4f1ecb24
treec38427f960496e51d370866975136d7f1ae7cfe1
parent6cb99be298f8b1b4363fdacc1cc631c3671380ec
parent9fa63d53c4620ead58a39d0a8b7e8382b664a511
merge in lmp-mr1-release history after reset to lmp-mr1-dev