merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Wed, 12 Nov 2014 14:11:25 +0000 (06:11 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 12 Nov 2014 14:11:25 +0000 (06:11 -0800)
commit3d3bf30e8c73bdd18b1a9bbb30addbb29ec8e117
treea978b869a7c762780e2bc35d72264a232339fe9f
parente871989b4d1c6590e7c280cbdd90c75ca82a877e
parent8631e61cfac21d41c144793637ef7621f3d31868
merge in lmp-mr1-release history after reset to lmp-mr1-dev