tree 0069d77f120aaaee916bb9552db15b985dedd767
parent da983f734c608fde57ea4f213d8640490a2f3a84
parent 0d47ac11764b89431777c3a84efd5fa9c17130dc
author Jim Miller <jaggies@google.com> 1296787328 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296787328 -0800

am 0d47ac11: Merge "Fix 3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb

* commit '0d47ac11764b89431777c3a84efd5fa9c17130dc':
  Fix 3419077: Allow subclasses to change SeekBarPreference action buttons.