]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 483bf9f d67c834)
am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependenc...
authorXavier Ducrohet <xav@android.com>
Thu, 18 Aug 2011 21:51:43 +0000 (14:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Aug 2011 21:51:43 +0000 (14:51 -0700)
* commit 'd98e1be20e1cca5c36c7e0344500d4a5574568aa':
  Change generated dependency file names

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

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