]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e4fddc bc7b4f4)
am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library...
authorXavier Ducrohet <xav@android.com>
Tue, 19 Jul 2011 17:18:25 +0000 (10:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 Jul 2011 17:18:25 +0000 (10:18 -0700)
* commit 'd5431ed5505a42e5e33c8bf7cc2ff72792979be9':
  Copy once-created R.java into library projects

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

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