merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Thu, 11 Dec 2014 14:13:05 +0000 (06:13 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 11 Dec 2014 14:13:05 +0000 (06:13 -0800)
commit6e9a485964905eb464791475fdb63bbaef166a3a
tree4a4686e8acad10475f55e9cc5e80b35ee48d02a9
parenta4710d5d926d8112179acece620f49cb79257e98
parent5ec042e6a1b075a69c741427be3f30556449f25d
merge in lmp-mr1-release history after reset to lmp-mr1-dev