]> git.saurik.com Git - android/aapt.git/commit
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)
commit0317e70f19be4f19126432fc76b3ad4be99fdd95
tree6c3aeb99d867c6a23dc63006fb205ed604531f97
parenta539f228b523c712fb9e61d4e5e4799a185b64ff
parentdcfa6438188a1b8e6138f3b4d3a0a98459a1223b
resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp

Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d