tree 83012f8d0ce2f01004d0ccb791f34f3d2e36e579
parent 2bb7624b6c6196f4ed1dd97e572252806fc20dc6
parent fc4971ba52b34d2b138cc975d328d1d586e84aea
author Jed Estep <jestep@google.com> 1456171339 +0000
committer android-build-merger <android-build-merger@google.com> 1456171339 +0000

Fix verifier test base testdata directory after merge conflict am: e1305768f6
am: fc4971ba52

* commit 'fc4971ba52b34d2b138cc975d328d1d586e84aea':
  Fix verifier test base testdata directory after merge conflict