tree dfd696862eeac80bf9f3f7f4a86c199635917281
parent 1a0f6a398d11db706b92fdc8ae438d7155c3fbaa
parent cc47007207f7eec0774ae05118846ee6cd73e309
author Joe Onorato <joeo@android.com> 1259814590 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259814590 -0800

am cc470072: am 87a80004: am b0c27f25: Bug 2290800 - Use a collator to sort the app labels.

Merge commit 'cc47007207f7eec0774ae05118846ee6cd73e309'

* commit 'cc47007207f7eec0774ae05118846ee6cd73e309':
  Bug 2290800 - Use a collator to sort the app labels.