]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94eabf4 232580c)
am 31820a35: Merge "Add --output-text-symbols option to aapt."
authorXavier Ducrohet <xav@android.com>
Mon, 17 Sep 2012 19:03:19 +0000 (12:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Sep 2012 19:03:19 +0000 (12:03 -0700)
* commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d':
  Add --output-text-symbols option to aapt.

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

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