merge in lmp-mr1-release history after reset to 71382693cbc81b1d131085f52d97879976706f55
authorThe Android Automerger <android-build@google.com>
Tue, 4 Nov 2014 14:12:32 +0000 (06:12 -0800)
committerThe Android Automerger <android-build@google.com>
Tue, 4 Nov 2014 14:12:32 +0000 (06:12 -0800)
commitf21774f8b74ce4049c280b7bc9883c1c7f0b5798
tree91be5c97f76d5835b9c2baf7b3f26267fb52293c
parent71382693cbc81b1d131085f52d97879976706f55
parenta97eab635aec45f74168dc252625682f06c7ddef
merge in lmp-mr1-release history after reset to 71382693cbc81b1d131085f52d97879976706f55