tree 3ee1c94081aad597863e2b624fc3cc87efe403b6
parent 3f3ce8adc7a4fcb5ec23a317c8b5063b61ac15a2
parent bfe1ab825731d365fef169deab646d7ceeafc998
author Elliott Hughes <enh@google.com> 1347232155 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347232155 -0700

am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."

* commit 'bfe1ab825731d365fef169deab646d7ceeafc998':
  Fix aapt to get expat header files from the approved location.