am 8858d0f9: am 1035e199: am 2485d9fc: Merge "Make Settings shortcuts launch into the correct activity/fragment." into jb-mr1-dev

* commit '8858d0f9d45d129c53ad18a2d8a2097c6215d25a':
  Make Settings shortcuts launch into the correct activity/fragment.
This commit is contained in:
Amith Yamasani
2012-10-01 11:18:30 -07:00
committed by Android Git Automerger
3 changed files with 16 additions and 16 deletions

View File

@@ -85,7 +85,7 @@ public class UserSettings extends SettingsPreferenceFragment
"key_add_user_long_message_displayed";
private static final int[] USER_DRAWABLES = {
R.drawable.ic_user,
R.drawable.ic_user_orange,
R.drawable.ic_user_cyan,
R.drawable.ic_user_green,
R.drawable.ic_user_purple,