]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ed1e6f 15c62a5)
am e6c0e993: Merge change I129483f8 into eclair-mr2
authorKenny Root <kroot@google.com>
Wed, 9 Dec 2009 23:51:21 +0000 (15:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Dec 2009 23:51:21 +0000 (15:51 -0800)
Merge commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b' into eclair-mr2-plus-aosp

* commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b':
  Optional use of UTF-8 strings in resource bundles

1  2 
Command.cpp patch | diff1 | diff2 | blob | history

diff --cc Command.cpp
Simple merge
mirror of aapt