tree b6be863f1faff7b11bf27880d4a7334b95d8f4b0
parent ced69386c75e4fdcdb58edab60328d1d0829c4cf
parent ccf1a55c805e851359c8e50ec67ca3a8556010f7
author The Android Automerger <android-build@google.com> 1423663887 -0800
committer The Android Automerger <android-build@google.com> 1423663887 -0800

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