| commit | 4fed695ef8700957c5fc78073129c4e8e3f66d4e | [log] [tgz] |
|---|---|---|
| author | Juan Lang <juanlang@google.com> | Thu Jun 22 14:35:41 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 22 14:35:41 2017 +0000 |
| tree | 7eb463fafce0a949d38b000e76c4268870333882 | |
| parent | 77f2f2df25154c2f555ba5a4cef7210224049344 [diff] | |
| parent | 1911226ba2a5de4fd9bba7178ebf15ef4e84843d [diff] |
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev am: f5d8628779 am: 1911226ba2 -s ours Change-Id: I347d9a78fd5cc00b9f47b2331b7ecb750c38eeda