am 20ec00d3: am 04df8b77: Iteration on multi-user storage UI.

* commit '20ec00d3e8681f57cdfe465a907c3fc705b05772':
  Iteration on multi-user storage UI.
am 7b251126: am 6c084141: Merge "Update Settings app to manipulate now-global settings properly" into jb-mr1-dev

* commit '7b2511260f3782d656e8712cf69edd9bf88a150b':
  Update Settings app to manipulate now-global settings properly
am 54ae7e51: am d4b711e6: Merge "Settings for the screen magnification feature." into jb-mr1-dev

* commit '54ae7e51a8a675e4ab4d671e19099f74502aba81':
  Settings for the screen magnification feature.
am b35bdfe9: am eda43176: Enable auto-brightness adjustment feature with system prop.

* commit 'b35bdfe9540b2e296fad57820d2b9ad7504532f9':
  Enable auto-brightness adjustment feature with system prop.
am e6195a12: am 1352c142: Merge "Add package verification to settings app" into jb-mr1-dev

* commit 'e6195a12edac8e32c9176771b36b64915498706d':
  Add package verification to settings app
am 32cf21c9: am bfbdceff: Grey out App Check setting when no verifiers exist

* commit '32cf21c9b9000238d69870cada23d45233d11670':
  Grey out App Check setting when no verifiers exist
am 5b0e875d: am de101033: Merge "Fixed the display count of connected panu device." into jb-mr1-dev

* commit '5b0e875d2d50d5a805028f495262fcbab9773c11':
  Fixed the display count of connected panu device.
am 206f87c5: am cce52bd3: Merge "Fix NPE in bluetooth Permission Activity" into jb-mr1-dev

* commit '206f87c5b99c5653b83ba55682ab4dd622fbfe6c':
  Fix NPE in bluetooth Permission Activity
am e42e895d: am f217f18d: Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev

* commit 'e42e895d9cedc83b5a2c4a86e20e6a34613f3332':
  Dream Settings: Disable settings icon if not selected.
am dd3f01af: (-s ours) am 6ac5ace7: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'dd3f01afc3836b9955273f75a5d5fb63798be77f':
  Import translations. DO NOT MERGE
am 8f113624: (-s ours) am 955f3477: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit '8f1136241df1544df54e653b007ca96da98ebae6':
  Revert "Import translations. DO NOT MERGE"
am 6a5929b0: Update Settings app to use new namespace for airplane-mode settings

* commit '6a5929b086a61a955a4a2f43f5fa251e8754ff4a':
  Update Settings app to use new namespace for airplane-mode settings
am 3c76c467: am 6a5929b0: Update Settings app to use new namespace for airplane-mode settings

* commit '3c76c467632194bc8bd4b8b69273ca4b5edf312d':
  Update Settings app to use new namespace for airplane-mode settings
Update Settings app to use new namespace for airplane-mode settings

Bug 7132230

Change-Id: I0253637e6d464afc229cf11ffe69852bf44fe261
Fix /proc/version parsing in Settings.

Change-Id: I4bde0e4935eaa4c27067062443a051976daa115d
Merge "Fix /proc/version parsing in Settings."
Fix color of text in widget picker
User management UI: take 2

Single screen user management, also visible on secondary users.
Work in progress, especially with respect to synchronizing with
the Me profile.

Change-Id: Id6e94a85d53356847e4e019c52e3388de9ecb354
Merge "User management UI: take 2" into jb-mr1-dev
am f7d76210: Merge "User management UI: take 2" into jb-mr1-dev

* commit 'f7d7621022e97b516ce9d3a9c72de1780d43e556':
  User management UI: take 2