tree 5f066d6ac54be2914906968afc118a73f496716d
parent a9e2fb6a1bd9fbc154ac4af0a23fbc4dedf3f2c4
parent 22bde2334ecbb45a23756edbdbbbdf48807dd822
author Keyvan Amiri <keyvana@google.com> 1475688713 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1475688714 +0000

Merge "Added SeekBarPreference to v7 pref support library"