tree 839265a3dbb7e133dcb60cf73c5d33da090c43ad
parent 3bf1c2ed203797fe93fc81f5775b451df6606488
parent 641c83a8645ef9fd99dca06ec30bae8449b959c7
author Roland Levillain <rpl@google.com> 1449583528 -0800
committer android-build-merger <android-build-merger@google.com> 1449583528 -0800

Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used." am: 763fd2d3d1 am: 74af075f11
am: 641c83a864

* commit '641c83a8645ef9fd99dca06ec30bae8449b959c7':
  Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.