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
This commit is contained in:
Kenny Root 2009-12-14 16:28:03 -08:00 committed by Android Git Automerger
commit d884af6a8b

Diff Content Not Available