am 8b6036c3: am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev

* commit '8b6036c3fb4ebaf63026c658fb6871e4f11ed070':
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 'ac8cfd0b9c4814e286e5147f90b80d295380a4a7':
am 7caa7515: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev

* commit '7caa7515f8673d9516620d2a5147be9e2233f1bb':
am 9d0fbd72: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev

* commit '9d0fbd728e93de2b6b08a68d5843f47d180e46e8':
am 5586afe0: am d983e1d1: Settings: Use new shared dream setting defaults.

* commit '5586afe0eb5b4d6fba04f76d2a589164c526614f':
am 3fd05c88: am 56a166e9: Added info about why Wi-Fi is required

* commit '3fd05c8853d67b273096dbbb7df6666273829ed5':
am 09a728a2: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev

* commit '09a728a2a919f5ec0c1bad9d3953f4bdc4bf52c2':
am 350ea07c: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '350ea07ca8e650bf167491deefdb421a183bbedd':
  Import translations. DO NOT MERGE
am 5fb549bf: am a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5fb549bf5f21cb240b4af35779e291d5d48f0109':
am 391dc9f7: am 3441d4ac: (-s ours) am 8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '391dc9f798a0b0314c0355a6347d38b8e2e8972e':
am 7ff9d5e1: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev

* commit '7ff9d5e100eb9a730c6f390eef04b6172e9d4288':
am ed3e89ab: am eabe82d0: am 7d078f94: Fix crash when viewing installed app details page

* commit 'ed3e89abe50425f50bce2880bff86a6e38772f10':
am 25608dd1: am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev

* commit '25608dd1a1fb03ed0b25eeb5966175dc6c620caa':
am 3ad17a08: am 89e93c97: am 7a1c4cdf: Fix check for multiple users

* commit '3ad17a084836a3a501229e09d29fe9d838bc440f':
am 98f884b1: am 26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev

* commit '98f884b19575e65702286820be58959c12f59815':
am b1571ad6: am 57569b40: am 6ec44ff0: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev

* commit 'b1571ad6866184c0048f60ea05e235856a1464b1':
am a7489954: am 50ab4b47: Merge "Manually enter translations for msgid: 9014073093293520112" into jb-mr1-dev

* commit 'a7489954019f0d451e0f63b8c39a6e06a9f83002':
am af8b915f: am 7367bb2a: am 91ecf27a: Correcting content description in Wifi network selection activity. Bug: 7362208

* commit 'af8b915f9c49b50aa02e41d3849ed0668b833328':
am 06545e87: am e508a26e: Remove blank translation string from en-GB, so it can show English.

* commit '06545e87b5db25abcdb5790c082fca894db9d664':
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 '2a43340ddb42ee3913235fcb9ddfd7ea33b6c085':