tree 87a74fb703968bbc86447866924561b3ed5c480b
parent 971c8f1912b903c64083378d382f46f81145a5f8
parent d378028bea92d43fb827308837f00737f0b3b701
author Nicolas Geoffray <ngeoffray@google.com> 1449097769 +0000
committer android-build-merger <android-build-merger@google.com> 1449097769 +0000

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

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