]> git.saurik.com Git - android/aapt.git/commit
am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
authorXavier Ducrohet <xav@android.com>
Thu, 21 Jul 2011 00:49:26 +0000 (17:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Jul 2011 00:49:26 +0000 (17:49 -0700)
commitc1b83bdbc6526f4c8f366bc3716f46b4ad93b0fd
treec100a65cb643089d659a38b3c56628709dcb4e46
parent072955603b0377ecc22fecdfcae6acbde773c0c5
parent1756596c3a90f6cdbaf2bdd855e53a5645ac7c15
am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp

* commit '84be06e4ce0778fbf0c1ac72f94795ef8433439b':
  Added Caching for PreProcessed PNGs
Resource.cpp