tree 34331724f4fa9544c90a70268303408202ebde4f
parent 1a1838940b802c0237fe2a2b64b9da6a689e5195
parent b9f11eb054bca7af2118e019ea09fda79671ca57
author Juan Lang <juanlang@google.com> 1498080318 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1498080323 +0000

Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib."