tree 5a21b10fef1c2efd4b2e4d8ac7b1dde0dfa7e3d0
parent b690187c4ffe61805344f22b6fcb15968ba8e9cf
parent f5e4dd01adcc086231ab1e847ec62547626a643e
author Joe Onorato <joeo@android.com> 1264026958 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1264026958 -0800

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.