]> git.saurik.com Git - android/aapt.git/commit
resolved conflicts for merge of 54cb63e2 to master
authorDianne Hackborn <hackbod@google.com>
Thu, 2 Jun 2011 23:44:52 +0000 (16:44 -0700)
committerDianne Hackborn <hackbod@google.com>
Thu, 2 Jun 2011 23:44:52 +0000 (16:44 -0700)
commit83c734a53b345465ecafa37c5c6d4cc180161d6f
treea5b3ab83706fb94130b2aa283819ccfd20110601
parent715618afe423f0b4234e82df4c8a6f572f6b086e
parente8d920f9f31f6bc817539d87c1a4953e71b86eec
resolved conflicts for merge of 54cb63e2 to master

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10