am 710aeba1: (-s ours) am c53ce268: (-s ours) Reconcile with jb-release - do not merge

* commit '710aeba1ce0bf2d121aaaf659284074750b43c6e':
am d2dec8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'd2dec8c70eb8f745425c09070069ef52d306b233':
  Import translations. DO NOT MERGE
am d4e216bc: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev

* commit 'd4e216bc9eb9b8aecd031a5f3c2a412857333a99':
  Revert "Import translations. DO NOT MERGE"
am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master

* commit '105d879ccef2517a07a15f29b956be739504fa73':
  Stop hard-coding sample 12- and 24-hour times.
am 88220b72: am 4ad02d02: am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings."

* commit '88220b72044392f0cbfecb24c84e6a63e82be25c':
  Stop using getDSTSavings.
am 96c2f8c5: Progress towards split storage categories.

* commit '96c2f8c50865e823e710be4d92f1589f978f03c2':
  Progress towards split storage categories.
am 04df8b77: Iteration on multi-user storage UI.

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

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

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

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

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

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

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

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

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

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

* commit '955f3477a910f56132f341f6679c9157b0cd515c':
  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 f7d76210: Merge "User management UI: take 2" into jb-mr1-dev

* commit 'f7d7621022e97b516ce9d3a9c72de1780d43e556':
  User management UI: take 2
am a47a3c8d: Merge "Fix color of text in widget picker" into jb-mr1-dev

* commit 'a47a3c8dea5212f95167b48be9a5f2af3d819c3a':
  Fix color of text in widget picker