OSDN Git Service

Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into...
authorJuan Lang <juanlang@google.com>
Thu, 22 Jun 2017 14:17:21 +0000 (14:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 14:17:21 +0000 (14:17 +0000)
am: f5d8628779

Change-Id: I7299706fbc31f17fb18a5225be0f6460dd04707e


Trivial merge