merge in lmp-mr1-release history after reset to 71382693cbc81b1d131085f52d97879976706f55
authorThe Android Automerger <android-build@google.com>
Sat, 1 Nov 2014 13:11:12 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 1 Nov 2014 13:11:12 +0000 (06:11 -0700)
commit8ee179e30333adf78e8ab119d9bab7cc1056abb9
tree91be5c97f76d5835b9c2baf7b3f26267fb52293c
parent71382693cbc81b1d131085f52d97879976706f55
parent85040d42ac9472eae19fa9fa7e197db4e04d1946
merge in lmp-mr1-release history after reset to 71382693cbc81b1d131085f52d97879976706f55