]> git.saurik.com Git - android/aapt.git/commit
resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Tue, 1 May 2012 17:00:22 +0000 (10:00 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 1 May 2012 17:02:02 +0000 (10:02 -0700)
commit49a9bf69364a9a501259785d47b9a4ac30e341eb
tree8140792f916236dead39a87d593e425a02ea92ce
parent56918fa3750fca8d91eaa99d1d21f0cdca3dbc5e
parentc01b75611d9ff56744f7ad14591db93a32b79afc
resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp

Change-Id: Ib7aa5a768f4606beb2a4387811cfed7c00cbc111
ResourceTable.cpp