| commit | ccdc8c61ab5231a01714b8996883cfab5f7da833 | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Wed Jan 20 14:35:58 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 20 14:35:58 2010 -0800 |
| tree | 5a21b10fef1c2efd4b2e4d8ac7b1dde0dfa7e3d0 | |
| parent | b690187c4ffe61805344f22b6fcb15968ba8e9cf [diff] | |
| parent | f5e4dd01adcc086231ab1e847ec62547626a643e [diff] |
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.