tree 7603fec4b017fed8cd6a509dcc82871338c70e64
parent bfc565eeefa5deefa68d00d391aa42f3bcda768e
parent 2b8ca93fda4dc7c9c1ac7dfdce8a5d0ebd3ab61a
author The Android Automerger <android-build@google.com> 1444091000 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444091000 +0000

am 2b8ca93f: am dcd9634c: am a25d0b97: am a0351d44: (-s ours) merge in lmp-mr1-cts-release history after reset to lmp-mr1-dev

* commit '2b8ca93fda4dc7c9c1ac7dfdce8a5d0ebd3ab61a':