merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Thu, 4 Dec 2014 14:11:35 +0000 (06:11 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 4 Dec 2014 14:11:35 +0000 (06:11 -0800)
commitc0148a3f26d9c9052f7c51a755a525deaf1b522f
tree90e22bc3384399429dfd4b2f62e09256bbc6ebad
parentd40d4a9ca488e4caa07ed7916ccae4b76c385cae
parent61fd1af3488f2e1503aa1aeb92ca53fc4f1ecb24
merge in lmp-mr1-release history after reset to lmp-mr1-dev