tree 322e62effaaecf9112c4cf5b5e3848ee0bb38343
parent ae98bbec51d7040a92bd53cd932bdebfcac97b31
parent 0cb43ab383acad21d89fb125288afbca8979b17f
author The Android Automerger <android-build@google.com> 1422367728 -0800
committer The Android Automerger <android-build@google.com> 1422367728 -0800

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