tree d5fe5bb968c00aa06388817bbb36ff272a09b246
parent 95b79966934864f1e81329de92562ee387ff5700
parent f46449abedcba2167fffa8ba8dc2f6d7a6d410b9
author Dianne Hackborn <hackbod@android.com> 1369551766 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369551766 -0700

am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"

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