tree 2a28d63c545a855c025eb8ce3a458a8ab58a7c36
parent bce66392fe728780bc203657f21e65ad53c097bb
parent 87a8000440d92be900a997f89b21e3261df872f0
author Joe Onorato <joeo@android.com> 1259776672 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259776672 -0800

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

Merge commit '87a8000440d92be900a997f89b21e3261df872f0' into eclair-mr2-plus-aosp

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