tree 38e56a28af87ff68595123e0a81e4d4d6b85f8b3
parent 7547d2831dbcd9e6359d0271200558eca68592cd
parent 07474561b4092ff5ec201587df9e51d01d5de568
author Nicolas Geoffray <ngeoffray@google.com> 1449171747 +0000
committer android-build-merger <android-build-merger@google.com> 1449171747 +0000

Merge "Revert "Fix test path in libarttest.mk"" am: 57989d6f72 am: d378028bea
am: 07474561b4

* commit '07474561b4092ff5ec201587df9e51d01d5de568':
  Revert "Fix test path in libarttest.mk"