]> git.saurik.com Git - android/aapt.git/commitdiff
projects / android / aapt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73c5a63 61fcc4d)
am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"
authorXavier Ducrohet <xav@android.com>
Fri, 10 Sep 2010 20:03:43 +0000 (13:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Sep 2010 20:03:43 +0000 (13:03 -0700)
Merge commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9' into gingerbread-plus-aosp

* commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9':
  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