merge in lmp-mr1-release history after reset to 71382693cbc81b1d131085f52d97879976706f55
authorThe Android Automerger <android-build@google.com>
Mon, 3 Nov 2014 14:11:13 +0000 (06:11 -0800)
committerThe Android Automerger <android-build@google.com>
Mon, 3 Nov 2014 14:11:13 +0000 (06:11 -0800)
commita97eab635aec45f74168dc252625682f06c7ddef
tree91be5c97f76d5835b9c2baf7b3f26267fb52293c
parent71382693cbc81b1d131085f52d97879976706f55
parent817d2375359679314e128a62930696c6fd3c1c58
merge in lmp-mr1-release history after reset to 71382693cbc81b1d131085f52d97879976706f55