tree 64b16fe62fa645372168a79d8db7a98eabdb24b0
parent 5fc6d60bff57b2c108badf8cac994d502d483f5f
parent 0010d492a2ea64e9dcb7d7e6081dafe92758c05e
author The Android Automerger <android-build@google.com> 1420639734 -0800
committer The Android Automerger <android-build@google.com> 1420639734 -0800

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