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
am 6413d965: Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev

* commit '6413d9658b0b7ac425621c488eb7c13b4fd295f4':
  Show the license dialog only if the activity is still showing
am b7808c71: am 6413d965: Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev

* commit 'b7808c71873f80dd4fb8c040960e92dd82b4b908':
  Show the license dialog only if the activity is still showing
Show the license dialog only if the activity is still showing

Bug: 6888990
Change-Id: Ide267739c7fd296356f26293f02bd794906fbd0a
Import translations. DO NOT MERGE

Change-Id: I9f722cc1c8451683f176ec7de9c62931426072f2
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I4469d469295c80f83cece04b90681ab4f35c5488
Auto-generated-cl: translation import
am a5c6d6b3: Import translations. DO NOT MERGE

* commit 'a5c6d6b32f2a5fe562dd77389d26c03c4b6f2e51':
  Import translations. DO NOT MERGE
am ebf1a4cc: (-s ours) am a5c6d6b3: Import translations. DO NOT MERGE

* commit 'ebf1a4cc6ae72e0790dd409b3d25890d415c782a':
  Import translations. DO NOT MERGE
am 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"

* commit '88f379367f208a75dfe95a081b25c27a54b06a1a':
  MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
am 534529d0: am 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"

* commit '534529d0cc08b5559aef2650d58aaf48c04727a0':
  MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
am f741006e: am 534529d0: am 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"

* commit 'f741006e7e542cebaa75fb3c05ade59a1f1d0891':
  MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Migrate legacy VPN arguments to system_server.

Generate the racoon and mtpd daemon arguments in system_server,
instead of accepting them from Settings.

Bug: 5756357
Change-Id: Ied048ca465aab03b2ae1c004388f49b82848b3f7
Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
am f3de41a2: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev

* commit 'f3de41a24d779c9fae6517ceb13596290076b600':
  Migrate legacy VPN arguments to system_server.
am 841c492e: am f3de41a2: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev

* commit '841c492eda689b438d2d8385009696d5119a8e02':
  Migrate legacy VPN arguments to system_server.
Make settings a little aware of multi-user install.

Change-Id: Id04f137dbc80dfee7b6c436efc2225ceccb88faa