]> git.saurik.com Git - android/aapt.git/commit
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)
commit3c8a9401edb6b5e23e9f4d1c2a3c5e0239020b08
treeb2650f03fc969c40bbe427cd2145503fee63c94e
parent23d6df59974b116d961dc15d9aaae925c8e9189d
parent460ed1b2ca88533065cacf04126c5813a21f5c29
manual merge due to conflicts

Change-Id: Id3901c3969111ea43ffdbfeadcf33491bb1c1114