am 23b07d55: am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"
am 23b07d55: am 43861f9d: am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"

* commit '23b07d5549bf38cfea388b439ac519670be6e7e2':
  Avoid IllegalArgumentException in Preference.java compareTo()

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