summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-01-20 14:35:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-20 14:35:58 -0800
commitccdc8c61ab5231a01714b8996883cfab5f7da833 (patch)
tree5a21b10fef1c2efd4b2e4d8ac7b1dde0dfa7e3d0
parentb690187c4ffe61805344f22b6fcb15968ba8e9cf (diff)
parentf5e4dd01adcc086231ab1e847ec62547626a643e (diff)
downloadandroid_packages_apps_Trebuchet-ccdc8c61ab5231a01714b8996883cfab5f7da833.tar.gz
android_packages_apps_Trebuchet-ccdc8c61ab5231a01714b8996883cfab5f7da833.tar.bz2
android_packages_apps_Trebuchet-ccdc8c61ab5231a01714b8996883cfab5f7da833.zip
am f5e4dd01: (-s ours) Put the label into the same texture as the icon.
Merge commit 'f5e4dd01adcc086231ab1e847ec62547626a643e' * commit 'f5e4dd01adcc086231ab1e847ec62547626a643e': Put the label into the same texture as the icon.
0 files changed, 0 insertions, 0 deletions