]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d284bd5 5cf1215)
am fa888784: am 89fef418: Merge "Avoid pre-processing images when they won\'t be...
authorXavier Ducrohet <xav@android.com>
Fri, 10 Sep 2010 22:01:56 +0000 (15:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Sep 2010 22:01:56 +0000 (15:01 -0700)
Merge commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b'

* commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b':
  Avoid pre-processing images when they won't be used

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

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