am b83b6f93: (-s ours) am 38ff9890: am ed49b6fc: am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'b83b6f932c751c0b68f4958e5f6afb76bf7c4540':
am 3b71b1ea: am 6576e1a7: am d4362b7d: Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev

* commit '3b71b1ea96759c21d85de9086281bb2901817c4e':
  Adding ability to add multiple keyguard widgets
am b7babc9e: am a1e3586a: am 67920f06: am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev

* commit 'b7babc9ec96a90b589ca7026237f39d55b43d4da':
am f2aa0fff: am 87e7c274: am 8a4024ec: Add ability to add clock widget to keyguard

* commit 'f2aa0fff88bc5801d107effbfb319593c6bd7a11':
  Add ability to add clock widget to keyguard
am d18a9238: am 586ba830: am 381df27c: am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev

* commit 'd18a923873e6e77bde8226ea80bac7052c4a92ef':
am 79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev

* commit '79b7fdd2c0682f59f3a0899041b470cc02154219':
  added dock audio settings for non bluetooth docks
am e42e7b85: Import translations. DO NOT MERGE

* commit 'e42e7b85285963cd959cec701689deaefbe44898':
  Import translations. DO NOT MERGE
am 65b9944f: am 79b7fdd2: Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev

* commit '65b9944f5c330f0d623a7fb059566eda942c7045':
  added dock audio settings for non bluetooth docks
am dd165551: am e42e7b85: Import translations. DO NOT MERGE

* commit 'dd16555147ec31734b755312d954342d02621587':
  Import translations. DO NOT MERGE
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Merge "Import translations. DO NOT MERGE"
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
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