]> git.saurik.com Git - android/aapt.git/commitdiff
am 15f1bfb0: Merge change I70d0bddb into eclair-mr2
authorKenny Root <kroot@google.com>
Tue, 15 Dec 2009 00:28:03 +0000 (16:28 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Dec 2009 00:28:03 +0000 (16:28 -0800)
Merge commit '15f1bfb0d29915ed1790b22a00fd7032f035ddb0' into eclair-mr2-plus-aosp

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


Trivial merge