]> git.saurik.com Git - android/aapt.git/commitdiff
resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Thu, 2 Sep 2010 19:05:33 +0000 (12:05 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 2 Sep 2010 19:05:33 +0000 (12:05 -0700)
Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d


No differences found