am d3a3bfd5: am af8b915f: am 7367bb2a: am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208

* commit 'd3a3bfd598ba21a43db7e5e66c90a98d028aa22c':
am 5224bbdf: am 2a43340d: am ff11f09a: am 50023033: Merge "Revert "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev

* commit '5224bbdf5bdc9f94c9f4b59e727c53975c01dcac':
am c3b4ff2a: am e447debb: am 0bfd02b0: am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev

* commit 'c3b4ff2a052c54a410f3c7e1bf9a9bf4093d80e0':
am d6f00550: (-s ours) am c2e65ef3: am 67a54eaa: (-s ours) am f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'd6f005501b38b437b421df584ee00d9b7bbcb678':
am 2fad38ec: am c5f7937e: am 17edbf38: am c14d1134: Merge "Fix bug #7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev

* commit '2fad38ec27036c0a9827700d3b0521e4d80f2e95':
am 33d4c1a3: am 653e5f9b: am 8b6036c3: am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev

* commit '33d4c1a313357fde783c555b4058801ec04a2f43':
am a086ff47: am 79cc26f2: am ac8cfd0b: am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev

* commit 'a086ff471e8d830f43f3bc69968a13b2da5973cd':
am e2d1799c: am 4d92c702: am 7caa7515: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev

* commit 'e2d1799cd0b99962e1bac4fd22126b922ff667ed':
am 0996fc88: am 717ad24a: am 9d0fbd72: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev

* commit '0996fc889372543bc0f0fc80df7d56dfae681ec5':
am b942b3ef: am 7c9b067b: am 5586afe0: am d983e1d1: Settings: Use new shared dream setting defaults.

* commit 'b942b3ef256a36e92c0bcae2d10e943541ca61eb':
am 14f54f88: am 1a15dcb1: am 3fd05c88: am 56a166e9: Added info about why Wi-Fi is required

* commit '14f54f88257c08a6932eba0b781b89468fa3632d':
am 1d53e5da: am bb15cfbd: am 09a728a2: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev

* commit '1d53e5da8097438c23dbf16f1ab74409e9c90135':
am 0c31e078: am e00f034e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '0c31e078d6a8337e002b084769caa94c199fe10f':
  Import translations. DO NOT MERGE
am 38ff9890: am ed49b6fc: am b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

* commit '6576e1a778c38039d7a4609f72fe892b8f70e2c7':
  Adding ability to add multiple keyguard widgets
am 1013f910: (-s ours) am aee2ef0a: am 350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '1013f910cdb66190b91b3b28fb3a4b251c9287e8':
  Import translations. DO NOT MERGE
am a1e3586a: am 67920f06: am b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev

* commit 'a1e3586a96de17f2a23b5e7bb9e7fff65d6ded3b':
am 6de2c973: (-s ours) am 27c1348b: am 5fb549bf: am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

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

* commit '87e7c274f26b078ddc7bcab783cecbcc0251c86b':
  Add ability to add clock widget to keyguard
am 15d10744: am d379946b: am 7ff9d5e1: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev

* commit '15d107441c05abc3e847fa0c270f2d6418f984e2':