merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Wed, 3 Dec 2014 14:10:36 +0000 (06:10 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 3 Dec 2014 14:10:36 +0000 (06:10 -0800)
commit2fa9c67b1a7439aa7ee7cb53c83f9a09674dccf6
tree0bf5f4187218a560e92873c632b6804cdb191780
parentd6d94475d878944562d0f1e16a5b6508fce87e3e
parent2883b8dcbba71b93d8311e3657cce4a01d1ca73b
merge in lmp-mr1-release history after reset to lmp-mr1-dev