tree cc8181b268797a37c7174c9d755a6810fdf30d09
parent 0f6927a6946350dcb3031baa9ce1c7575f48307e
parent 6fa5d3721284ab6fed114467cbd3c9f2b915beed
author The Android Automerger <android-build@google.com> 1423059042 -0800
committer The Android Automerger <android-build@google.com> 1423059042 -0800

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