am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev

* commit 'b02771eff35cccf03202e4b8e27a44681a5f7570':
  Reduce jank in security lock selection by finishing on return
merge in jb-mr1-release history after reset to jb-mr1-dev
Add ability to add clock widget to keyguard

Change-Id: I70e6fbb664181efc2906ed33d732695279462a95
Merge "Wording change for Daydream setting" into jb-mr1-dev
am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev

* commit '4cf289ad4d2d4f6ef0950b8542f53366f7e6f923':
  Wording change for Daydream setting
merge in jb-mr1-release history after reset to jb-mr1-dev
added dock audio settings for non bluetooth docks

This is a quick implementation allowing support for non bluetooth
audio docks.

Longer term it would be better to generalize DockService to support
all kinds of docks.

Bug 7302106.

Change-Id: I2df31ddbd8057a7297b244ea6a9e2d5a6a39bf7f
Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
Import translations. DO NOT MERGE

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

Change-Id: I60f85bd27cdf76663190767052c90db3c521848f
Auto-generated-cl: translation import
am e42e7b85: (-s ours) Import translations. DO NOT MERGE

* commit 'e42e7b85285963cd959cec701689deaefbe44898':
  Import translations. DO NOT MERGE
merge in jb-mr1-release history after reset to jb-mr1-dev
Allow wireless charging during encrypt

Bug: 7426476 Cant Encrypt mako device using Charging pad as charging
             source

Change-Id: I6584a9e7a1533e06f0b0d55c1afd42641ee7ac3d
Import translations. DO NOT MERGE

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

Change-Id: Ifdee0ced0a57d8ccf512e12166ea1ec66418a6c2
Auto-generated-cl: translation import
Selectively enable bugreport in power menu.

The underlying bugreport init service depends on USB debugging being
turned on for user builds.  This change makes the developer options
UI reflect this constraint.

Bug: 7427434
Change-Id: I8dc16cc53ec4a97a3b39ee631694456be3bde081
am 8d028a87: Allow wireless charging during encrypt

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

* commit '2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54':
  Import translations. DO NOT MERGE