am aea749fa: am 9e0fdfec: Merge "Simplify proxy regex" into jb-mr1-dev

* commit 'aea749fa94f9d1c0b5dd7c16247b8c2eeca23462':
  Simplify proxy regex
Reconcile with jb-mr1-release - do not merge

Change-Id: I85140e245de7ea2f1cb63252294e4cfe71b8006e
am f1a3161e: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f1a3161ef3b51226ddea9b81eb673bb127a953fa':
Simplify User management settings to bare minimum

No need to restrictions or account association at this time.

Change-Id: Ic4ae43d5bb9d4308e67499495d44c12de9e61777
Merge "Simplify User management settings to bare minimum" into jb-mr1-dev
am b18d58bd: Merge "Simplify User management settings to bare minimum" into jb-mr1-dev

* commit 'b18d58bdf5501a50d4a2d726c875676b16a657e2':
  Simplify User management settings to bare minimum
am 9a53625b: am b18d58bd: Merge "Simplify User management settings to bare minimum" into jb-mr1-dev

* commit '9a53625bd039abc5b08fd26e9d35e25c5268bfd1':
  Simplify User management settings to bare minimum
Merge "Import translations. DO NOT MERGE"
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
am e3a49d76: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'e3a49d7665b6eda9a19375bb4f306113163ddc93':
  Import translations. DO NOT MERGE
am ba2ab869: (-s ours) am e3a49d76: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'ba2ab869e9598383cf19397ea980925bd7fd1c07':
  Import translations. DO NOT MERGE
merge in jb-mr1-release history after reset to jb-mr1-dev
Settings: Minimal refactor to support new dreams api.

Fix breaking changes to the dreams api.  Master toggle
and multiple dreams support in Settings will be done in
a subsequent change.

Bug:7028665
Change-Id: Ia56dd00ec50323fbba06473b1747e5015a3f1898
Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"

* commit '1183f487c8ea8660415fcd30914844e8dc2de2bb':
  MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev
am 05b5097d: Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev

* commit '05b5097d1871fc445fec27734b2f667539a13da0':
  Settings: Minimal refactor to support new dreams api.
am 156d6afa: am 05b5097d: Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev

* commit '156d6afa77ee8a8bff2fc6398142b9204ba54b92':
  Settings: Minimal refactor to support new dreams api.
Show the license dialog only if the activity is still showing

Bug: 6888990
Change-Id: Ide267739c7fd296356f26293f02bd794906fbd0a
Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev