tree 6f319089980073ffb2c20d36e367a944daa525c4
parent 0121555032ff156fb96e957517cb92416ec2af69
parent 74af075f11e23918edc25c86fb2f1d8209cf94fc
author Roland Levillain <rpl@google.com> 1449583352 +0000
committer android-build-merger <android-build-merger@google.com> 1449583352 +0000

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

* commit '74af075f11e23918edc25c86fb2f1d8209cf94fc':
  Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.