[tor-commits] [orbot/master] Merge branch 'bitmold-no_personalized_learning_kb'

[n8fr8 at torproject.org]

commit 1316fd6542fda4a56e0fb188f5946d8fa3ce4d5c
Merge: aa8ad867 e3fd4afa
Author: n8fr8 <nathan at guardianproject.info>
Date:   Wed May 29 16:59:38 2019 -0400

    Merge branch 'bitmold-no_personalized_learning_kb'

 .../android/settings/SettingsPreferences.java      | 37 ++++++++++++++--------
 .../android/ui/NoPersonalizedLearningEditText.java | 13 ++++++++
 .../ui/hiddenservices/dialogs/AddCookieDialog.java |  4 +--
 .../ui/hiddenservices/dialogs/HSDataDialog.java    |  4 +--
 .../res/layout/layout_add_client_cookie_dialog.xml |  4 +--
 app/src/main/res/layout/layout_hs_backups_list.xml |  1 -
 app/src/main/res/layout/layout_hs_data_dialog.xml  |  8 ++---
 app/src/main/res/layout/layout_settings.xml        | 29 -----------------
 8 files changed, 47 insertions(+), 53 deletions(-)