tree 64b16fe62fa645372168a79d8db7a98eabdb24b0
parent 128625222ca68a19d4cc47cca0804e598219d9a6
parent 4530b5b3ddbce81c6cdd8931086050eeaf002650
author Nicholas Sauer <nicksauer@google.com> 1420584065 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420584065 +0000

am 4530b5b3: am 8c35aff7: Merge "Fix cts verifier manifest. " into lmp-dev

* commit '4530b5b3ddbce81c6cdd8931086050eeaf002650':
  Fix cts verifier manifest.