tree 1c65ac35c7a23cb28c418dc4f0130e6c3d25d5b7
parent 83652ebfe1963bcecdcf24383165904223baca6e
parent 15f1bfb0d29915ed1790b22a00fd7032f035ddb0
author Kenny Root <kroot@google.com> 1260836883 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260836883 -0800

am 15f1bfb0: Merge change I70d0bddb into eclair-mr2

Merge commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0' into eclair-mr2-plus-aosp

* commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0':
  Revise aapt options for UTF8/16 encoding