]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c16f66a 57eb8d8)
resolved conflicts for merge of 06a8ceac to master
authorDianne Hackborn <hackbod@google.com>
Fri, 20 May 2011 04:44:52 +0000 (21:44 -0700)
committerDianne Hackborn <hackbod@google.com>
Fri, 20 May 2011 04:44:52 +0000 (21:44 -0700)
Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69


Trivial merge
mirror of aapt