]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fe0cee a539f22)
am b4649ec7: am 23827557: Merge "Add a --debug-mode option to aapt." into gingerbread
authorXavier Ducrohet <xav@android.com>
Tue, 31 Aug 2010 21:35:28 +0000 (14:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Aug 2010 21:35:28 +0000 (14:35 -0700)
Merge commit 'b4649ec720fa959b700a7a03c089bfdc61321d16'

* commit 'b4649ec720fa959b700a7a03c089bfdc61321d16':
  Add a --debug-mode option to aapt.

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

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