merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Mon, 10 Nov 2014 14:10:57 +0000 (06:10 -0800)
committerThe Android Automerger <android-build@google.com>
Mon, 10 Nov 2014 14:10:57 +0000 (06:10 -0800)
commit8631e61cfac21d41c144793637ef7621f3d31868
tree84c605a69f7cb8c4a6af08e4e60fc0b99f3fae07
parent49c059220a3df5ea6d4e9ee2fdbdc9556cbbb1b1
parent83f6d35338e2d1a47896094780a90766e8eb55f6
merge in lmp-mr1-release history after reset to lmp-mr1-dev