am f518ad0a: Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"
am f518ad0a: Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"

* commit 'f518ad0a4941236b72b5d090320d4ab70ebbf26b':
  IndexOutOfBoundsException on addPreference in PreferenceGroup

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base