tree 26c8aa1ca5a9ed8400fbb919b22483d5b08a6c10
parent ff6ec86d06023f98bbdd9657a359fdbaecae7700
parent ccc445f6593e8267496e4a673a1a93c647b63d53
author Lorenzo Colitti <lorenzo@google.com> 1394817192 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394817192 +0000

am ccc445f6: am 20615c2b: Merge "Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml"

* commit 'ccc445f6593e8267496e4a673a1a93c647b63d53':
  Ensure that the native tests are run from /data/nativetest to match TF. Also cleanup a missing test from test_defs.xml