tree c028bfe537607823c37e2ffc8c713c73059d3130
parent ce0117dc598f24e97b929df5567329e4816a777d
parent d8b76d24b314f91c4c6520ebfaf74a207918e55a
author The Android Automerger <android-build@google.com> 1422983159 -0800
committer The Android Automerger <android-build@google.com> 1422983159 -0800

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