]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 715618a e8d920f)
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)
Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10


Trivial merge
mirror of aapt