tree f759bdca66b92c5a9dcd354baaf3ebd119ad8de5
parent 962c464d3661e9ad9ef4f84ada8689879b5e1167
parent 29dbef28a9fa99d337265de1f054ba418f6bf127
author jeffhao <jeffhao@google.com> 1338423023 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338423023 -0700

am 29dbef28: Merge "Fix build to rebuild tests correctly, and disable pre-dexopt." into ics-mr1-plus-art

* commit '29dbef28a9fa99d337265de1f054ba418f6bf127':
  Fix build to rebuild tests correctly, and disable pre-dexopt.