am 8ae40a07: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '8ae40a07a4b8d9c9ccd73a6eba5ac62be3b8b5ef':
  Import translations. DO NOT MERGE
am 8d028a87: Allow wireless charging during encrypt

* commit '8d028a87e97f9420f9db31a6b8aa80859fe393b3':
  Allow wireless charging during encrypt
am 2e0679ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54':
  Import translations. DO NOT MERGE
am 9ad7e7e3: am 8d028a87: Allow wireless charging during encrypt

* commit '9ad7e7e3dabc0c0125f1373164857e8782e443dd':
  Allow wireless charging during encrypt
am 5ba8c670: am 2e0679ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5ba8c670a95dc54f3d384c91a2719a06c706d4ce':
  Import translations. DO NOT MERGE
Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev

* commit 'c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
  Selectively enable bugreport in power menu.
am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev

* commit 'c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
  Selectively enable bugreport in power menu.
am ea6f5051: am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev

* commit 'ea6f50515620c4ab5abefeca8431505b05db9672':
  Selectively enable bugreport in power menu.
am 539d7c66: am 65b9944f: am 79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev

* commit '539d7c66d624107816c62184ebd6eaede3715ac5':
  added dock audio settings for non bluetooth docks
am ef9e8203: (-s ours) am dd165551: am e42e7b85: Import translations. DO NOT MERGE

* commit 'ef9e8203074f88d2dfa211877ab10331a011e932':
  Import translations. DO NOT MERGE
Whoops, missed a 'Sleep Mode' -> 'Daydream' string.

Change-Id: I7ed00811e2c31459aaa32336dba4ff75b095f5ef
merge in jb-mr1-release history after reset to jb-mr1-dev
am a2018c94: (-s ours) am 8ae40a07: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'a2018c946f2f3940be3fbb6201e87a913c3491d1':
  Import translations. DO NOT MERGE
am 09b3127a: am 9ad7e7e3: am 8d028a87: Allow wireless charging during encrypt

* commit '09b3127aad97efba5135f4a5d63b473586c850dc':
  Allow wireless charging during encrypt
am 939d0f1d: (-s ours) am 5ba8c670: am 2e0679ed: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '939d0f1d72fe152e655a2c4768fb5f37e7545df3':
  Import translations. DO NOT MERGE
am 92fe12e6: am ea6f5051: am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev

* commit '92fe12e657083ea5e254ac3e3e0f5649cd9872a2':
  Selectively enable bugreport in power menu.
display audio dialog when connecting low end dock

Display a dialog to enable the use of the dock audio connection
when a low end dock is connected for the first time.

Modify DockService to process docked and undocked messages even if
the device indicated is null (meaning the dock is not a bluetooth dock)
only for low end docks.

Bug 7302106.

Change-Id: I331d83a74fecf5f26b24bfc178342df414bd8153
Merge "Whoops, missed a 'Sleep Mode' -> 'Daydream' string." into jb-mr1-dev
am 29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev

* commit '29c4c88be2c2f225a1daff551b4e32ed03cc1bda':
  Whoops, missed a 'Sleep Mode' -> 'Daydream' string.