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

* commit 'b46886f41d142cc63e054814caf76d15bf2f8cb6':
  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