]> git.saurik.com Git - android/aapt.git/commit
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)
commitd761ed6a172ce0a714f3512654e88a4fe7476a1a
tree579413285918a345fe5790cba5c4681d8902a199
parent19900ee94e1faf29b5ab5e11c0dfbf42d3f995c1
parent28de9b930f847bb39b41f596f4520e5a306b2078
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