merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Wed, 19 Nov 2014 14:11:28 +0000 (06:11 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 19 Nov 2014 14:11:28 +0000 (06:11 -0800)
commit2fe536f9bad802fe6fcbe16d7b33bdac37b2f345
tree308b9f187269b13a22b405fca6d2d2c39bd99ecb
parent168c634eef29f21c73129164207d04b8cce23738
parent3d3bf30e8c73bdd18b1a9bbb30addbb29ec8e117
merge in lmp-mr1-release history after reset to lmp-mr1-dev