tree 6471fdd1e2e366304321bd46d0807f0507f9a83c
parent b110da5f2bf9cf105dd675648075d13c942d1892
parent 8fb55d06c7bd153e673c1372b3af75bcb849ed9d
author Brian Carlstrom <bdc@google.com> 1403124413 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403124413 +0000

am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."

* commit '8fb55d06c7bd153e673c1372b3af75bcb849ed9d':
  Remove some uses of the deprecated WITH_HOST_DALVIK.