merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Thu, 5 Feb 2015 14:13:32 +0000 (06:13 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 5 Feb 2015 14:13:32 +0000 (06:13 -0800)
commit9270c535ff88963a719e80325e88359a26acb47b
treec6571dac074b93116be61d13ef6f37271d11c481
parent1112f2fc374699af6ea7c40dc5e57f0bfd77c338
parent9ba3d035310b7936cf048db79bc273f096c95b9b
merge in lmp-mr1-release history after reset to lmp-mr1-dev