From: Juan Lang <juanlang@google.com>
Date: Thu, 22 Jun 2017 14:17:21 +0000 (+0000)
Subject: Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into... 
X-Git-Tag: android-x86-9.0-r1~1030^2~788
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1911226ba2a5de4fd9bba7178ebf15ef4e84843d;p=android-x86%2Fframeworks-base.git

Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev
am: f5d8628779

Change-Id: I7299706fbc31f17fb18a5225be0f6460dd04707e
---

1911226ba2a5de4fd9bba7178ebf15ef4e84843d