tree b991a73a5a8118c11232127558910beea8e6f37f
parent 753817f9577fe074789422d951485bdf350cb75f
parent a43f117eacc3d3cabec15649241094d194c8774a
author The Android Automerger <android-build@google.com> 1415549142 -0800
committer The Android Automerger <android-build@google.com> 1415549142 -0800

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