]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28e2ac9 f77a54f)
am 36ac43ba: Merge "Tweak default ignore-assets path"
authorTor Norbye <tnorbye@google.com>
Tue, 5 Jun 2012 15:41:16 +0000 (08:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Jun 2012 15:41:16 +0000 (08:41 -0700)
* commit '36ac43ba9982a78b4a047c8970776505a3fab4da':
  Tweak default ignore-assets path

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

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