]> git.saurik.com Git - android/aapt.git/commit
resolved conflicts for merge of 06a8ceac to master
authorDianne Hackborn <hackbod@google.com>
Fri, 20 May 2011 04:44:52 +0000 (21:44 -0700)
committerDianne Hackborn <hackbod@google.com>
Fri, 20 May 2011 04:44:52 +0000 (21:44 -0700)
commitc8e46fb04e626b26511095db9e6b4fe68eb74b35
tree5ef05545b964a450d44e01211062bdf2accc08dd
parentc16f66a712f69e002a4a9de27a9c82352d9092c3
parent57eb8d8693135a33a186fad3a4c854b5c13337fb
resolved conflicts for merge of 06a8ceac to master

Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69