]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23d6df5 460ed1b)
manual merge due to conflicts
authorandroid-build SharedAccount <android-build@google.com>
Mon, 29 Nov 2010 17:22:05 +0000 (09:22 -0800)
committerandroid-build SharedAccount <android-build@google.com>
Mon, 29 Nov 2010 17:22:05 +0000 (09:22 -0800)
Change-Id: Id3901c3969111ea43ffdbfeadcf33491bb1c1114


Trivial merge
mirror of aapt