]> git.saurik.com Git - android/aapt.git/commit
resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
authorXavier Ducrohet <xav@android.com>
Thu, 21 Jul 2011 00:45:11 +0000 (17:45 -0700)
committerXavier Ducrohet <xav@android.com>
Thu, 21 Jul 2011 00:45:11 +0000 (17:45 -0700)
commit1756596c3a90f6cdbaf2bdd855e53a5645ac7c15
tree02800b6bf55d6fa6caa695051d011d9a92885d62
parent82cf0eaeddd1f87bf54db24d3f84856a679e53a4
parentdddb1fc74cc15f34219c2b4eda474245335cdc90
resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp

Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
Command.cpp
Package.cpp
Resource.cpp