tree bb2d3ea00ab35617b590f3e553d7cfd5836af2f4
parent 445111a1c977e94a4233efd54f3690defa4a7582
parent 13baf92d93c17e0b939a30ef4821a374faf037fe
author The Android Automerger <android-build@google.com> 1414937335 -0800
committer The Android Automerger <android-build@google.com> 1414937335 -0800

merge in lmp-mr1-release history after reset to 445111a1c977e94a4233efd54f3690defa4a7582