tree 6598598ced00970e15fb60e5872049ebac468f35
parent b1ba5ec9cf1477010fa4bd151aad80eedd8a8c0c
parent f8b804f8c532c6d913d8389f9a8e4c05a8f0310c
author Ying Wang <wangying@google.com> 1354579645 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354579645 -0800

am f8b804f8: Merge "Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true"

* commit 'f8b804f8c532c6d913d8389f9a8e4c05a8f0310c':
  Autoadd core-hostdex if LOCAL_BUILD_HOST_DEX is true