]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03de9b7 3b663f2)
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)
Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6


Trivial merge
mirror of aapt