]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7de6a72 d25ea7e)
resolved conflicts for merge of 77fc8b80 to master
authorDianne Hackborn <hackbod@google.com>
Tue, 14 Jun 2011 19:17:35 +0000 (12:17 -0700)
committerDianne Hackborn <hackbod@google.com>
Tue, 14 Jun 2011 19:17:35 +0000 (12:17 -0700)
Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d


Trivial merge
mirror of aapt