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

* commit '260e34b2d57cf793d684b8aafeaee9d8e4b44c87':
  More descriptive summary for "Sleep Mode" pref.
am 6749fb88: am 260e34b2: am deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev

* commit '6749fb88efaacf1e1de23fd170d0797562101aee':
  More descriptive summary for "Sleep Mode" pref.
am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev

* commit '8346107d25a05580fa98adaaff9d28c025d3faed':
  bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
am 3e1e454b: am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev

* commit '3e1e454b208caaf270eee490fe86cf828e3b6900':
  bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
am ecb7f618: am 3e1e454b: am 8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev

* commit 'ecb7f618576300e5d729c1aab2938169634f0d33':
  bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev

* commit '8b98246559c7422e507458a63c8dfc2783bd0afc':
  Control OpenGL traces from Developer Options in Settings
am 6dc2c7a5: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev

* commit '6dc2c7a535f960870f8bf644410574eec2650e88':
  Control OpenGL traces from Developer Options in Settings
am b8b34ba9: am 6dc2c7a5: am 8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev

* commit 'b8b34ba9f5e1fb545276dc95ff57859e26188265':
  Control OpenGL traces from Developer Options in Settings
am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev

* commit '5a740ab1b9d5757d684f6a798932f0b4729cc9a7':
  More migration to Global settings.
am 0d4fd237: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev

* commit '0d4fd237ea6040b3ca147addcf097fb283cf3af6':
  More migration to Global settings.
am 049ccb55: am 0d4fd237: am 5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev

* commit '049ccb55361de3ef41b01875569b341c4f06d1db':
  More migration to Global settings.
am d983e1d1: Settings: Use new shared dream setting defaults.

* commit 'd983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9':
  Settings: Use new shared dream setting defaults.
am 76f99688: am d983e1d1: Settings: Use new shared dream setting defaults.

* commit '76f99688cfc0f0c3a7e3782e8b9bcd640a0e4653':
  Settings: Use new shared dream setting defaults.
am 9055dd74: am 76f99688: am d983e1d1: Settings: Use new shared dream setting defaults.

* commit '9055dd74f4ac42e422de941259d9f9c437ef9eca':
  Settings: Use new shared dream setting defaults.
am 56a166e9: Added info about why Wi-Fi is required

* commit '56a166e9e3cac96246bd724ceea96846fc9e41e1':
  Added info about why Wi-Fi is required
am 5c412204: am 56a166e9: Added info about why Wi-Fi is required

* commit '5c412204a63031b4dee3195d3a350d9e2d929fe4':
  Added info about why Wi-Fi is required
am 86a52bec: am 5c412204: am 56a166e9: Added info about why Wi-Fi is required

* commit '86a52bec4b0134e540cc5c546da4e88dc2d62487':
  Added info about why Wi-Fi is required
am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev

* commit 'a023f4f6404027c3525af2cc48535a208e33b1d8':
  Prevent sync state changes when user is a monkey
am 6a07244f: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev

* commit '6a07244fa83a4c6296d8a743238b6bd936bfb3ba':
  Prevent sync state changes when user is a monkey
am 8f2a9c00: am 6a07244f: am a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev

* commit '8f2a9c0043081f0008bfadc50bb7cbc010a2b3cb':
  Prevent sync state changes when user is a monkey