]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40b7bac 70a898d)
am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"
authorTor Norbye <tnorbye@google.com>
Tue, 5 Jun 2012 15:45:20 +0000 (08:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Jun 2012 15:45:20 +0000 (08:45 -0700)
* commit '44ff9b8f9294e015031fc9293974604771e5efdd':
  Tweak default ignore-assets path

1  2 
AaptAssets.cpp patch | diff1 | diff2 | blob | history

diff --cc AaptAssets.cpp
Simple merge
mirror of aapt