]> git.saurik.com Git - android/aapt.git/commit
resolved conflicts for merge of bbca8133 to master
authorDianne Hackborn <hackbod@google.com>
Tue, 24 May 2011 18:27:11 +0000 (11:27 -0700)
committerDianne Hackborn <hackbod@google.com>
Tue, 24 May 2011 18:27:11 +0000 (11:27 -0700)
commit715618afe423f0b4234e82df4c8a6f572f6b086e
treeb38166c9f5b36eee3dd2a0d6296417ab54c1d144
parent03de9b7f4db2b8dac61f0154a9600c0371c000d3
parent3b663f23c9c168a06b534802d8f5e4d28589b8ab
resolved conflicts for merge of bbca8133 to master

Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6