tree f3750d1b126c9bd26adb156deb1920206dddcc0e
parent 4595d7d62c0d594aa3501e4f547563348a3a5eb0
parent 6a6723a0a9c2b3c1756ce8cdf1910ade264c26ef
author Ying Wang <wangying@google.com> 1347390874 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347390874 -0700

am 6a6723a0: am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."

* commit '6a6723a0a9c2b3c1756ce8cdf1910ade264c26ef':
  android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.