merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Tue, 9 Dec 2014 14:10:22 +0000 (06:10 -0800)
committerThe Android Automerger <android-build@google.com>
Tue, 9 Dec 2014 14:10:22 +0000 (06:10 -0800)
commit17419d98813fe4ce210268728cb09f2013b19cbf
tree3371f14b292e3b77a16cf9c2fd490d43a15bc070
parenta6fbae9f8c793118e008a98d3576df316bf0364a
parent5931e977df6eacfc9e7a1b495a6ba70508820658
merge in lmp-mr1-release history after reset to lmp-mr1-dev