merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Tue, 2 Dec 2014 14:10:55 +0000 (06:10 -0800)
committerThe Android Automerger <android-build@google.com>
Tue, 2 Dec 2014 14:10:55 +0000 (06:10 -0800)
commit9fa63d53c4620ead58a39d0a8b7e8382b664a511
treecb2f8c41e8789474dca9f8786f2f795102d6bd34
parentabbd7880cf8e29274dfc0508568fbffe9f49cad7
parentefc802925a86aa23259eb04ebb84d1f767d267c5
merge in lmp-mr1-release history after reset to lmp-mr1-dev