]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1661df 4bb85b9)
am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation...
authorXavier Ducrohet <xav@android.com>
Tue, 19 Jul 2011 17:23:19 +0000 (10:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 Jul 2011 17:23:19 +0000 (10:23 -0700)
* commit '9139868b6c5cb29b3665984225dceb0193fec31d':
  Add dependency generation to Aapt for R.java

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

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