tree bfc4c85a9acba7fbcedd3bdc86e5b1e9ff82854d
parent ec866f811b1b1af588162c6ae0b45c3f36d3a0f4
parent 6694fdb2646a3a6223c9898b38218cb63f850c64
author The Android Automerger <android-build@google.com> 1415110115 -0800
committer The Android Automerger <android-build@google.com> 1415110115 -0800

merge in lmp-mr1-release history after reset to ec866f811b1b1af588162c6ae0b45c3f36d3a0f4