]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0150a07 82cf0ea)
am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
authorXavier Ducrohet <xav@android.com>
Thu, 21 Jul 2011 00:18:04 +0000 (17:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Jul 2011 00:18:04 +0000 (17:18 -0700)
* commit 'a125c937de06b1cc43368743592f47513eb88b76':
  Add generation of dependency file for .ap_ package

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

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