am 09639c24: (-s ours) am 57c88834: (-s ours) am 9fe36302: (-s ours) am 9cb97c44: Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread

* commit '09639c243b6f43a355f42ac90c87dec37a355eb3':
  DO NOT MERGE Fix crash when device is null in Connection Access Cancel.
am 50d69c83: Merge "Shorten data usage settings label so it won\'t truncate. Bug: 5226216"

* commit '50d69c83400238ee036ca3ae0f377f64aba411d4':
  Shorten data usage settings label so it won't truncate. Bug: 5226216
am 9ca0ef57: Merge "Power control widget holofied"

* commit '9ca0ef5732d2d25f367b5fa01e8b6562f82d788d':
  Power control widget holofied
am 7a7ea2bf: Sync asset drop and smoother animation.

* commit '7a7ea2bf2f8d0760cc3f6768b6b4bb0f6f7f0d7d':
  Sync asset drop and smoother animation.
am bf6856dd: Data usage asset updates.

* commit 'bf6856dd6ba7de7886e90a16c10b030a71950e32':
  Data usage asset updates.
am 8ff6222a: Fix the visibility of preferences in the input method settings

* commit '8ff6222a9136cdbaeea9191869b90abd179efc85':
  Fix the visibility of preferences in the input method settings
am 14413a02: Add a functionality to disable the spell checker

* commit '14413a02e3ce8a2f128ec8eccdb648420e0b9297':
  Add a functionality to disable the spell checker
am ca6d987a: Merge "Fix a bug in disabling wifi tethering on a wifi-only device."

* commit 'ca6d987a87698cda7ca216adb8e827b30111f984':
  Fix a bug in disabling wifi tethering on a wifi-only device.
am f38534f4: Merge "Expose wifi p2p toggle switch to user"

* commit 'f38534f4b5d9f37753ccdffea3337b6f11cb8375':
  Expose wifi p2p toggle switch to user
am be4fa0bf: Merge "Misc fixes to CryptKeeper"

* commit 'be4fa0bf95006c8c8e4471c9122c771def38f13b':
  Misc fixes to CryptKeeper
am 9a4543e1: Fix unresponsive UI during scan and display of "No Bluetooth devices"

* commit '9a4543e1de4251463cf14150260baaf8753bd3c0':
  Fix unresponsive UI during scan and display of "No Bluetooth devices"
am dbb3afd7: Merge "Update settings wording for ICS"

* commit 'dbb3afd7edba73b8930db785a193f063beebe906':
  Update settings wording for ICS
am 7fe1435b: Fix a string that was forgotten

* commit '7fe1435b5e6c1de4b5ad5852c11ecb42c433ddd2':
  Fix a string that was forgotten
am 7edbc609: Merge "Use the new isNetworkSupported api for wifi-only"

* commit '7edbc609fdccff3367b119da46ff1adbe4477d10':
  Use the new isNetworkSupported api for wifi-only
am 24e07307: Merge "Remove unreferenced assets in Settings Bug: 5032006"

* commit '24e073071df2b61afb6ba8b31206bef71cc22b91':
  Remove unreferenced assets in Settings Bug: 5032006
am 3a79bad4: Merge "Intent.getAction() can return null"

* commit '3a79bad40933166ff4c20d9eafc6aa3edbea1ea1':
  Intent.getAction() can return null
am 76631f3a: Merge "Update of accessibility settings"

* commit '76631f3a907a4f2986608f170490b615f464051d':
  Update of accessibility settings
am 4853d276: Merge "Misc UI fixes for settings (mostly cryptkeeper)"

* commit '4853d2762858ba12f570b8b8dcea805bcb0d6865':
  Misc UI fixes for settings (mostly cryptkeeper)
am 9bc770b0: Merge "Use the same empty message for user dictionary on tablets and phones."

* commit '9bc770b0b750a6c9511e106c8b6580a81ca792e3':
  Use the same empty message for user dictionary on tablets and phones.
am 1679b2c2: Merge "Ignore the volume hard keys in Volume settings screen."

* commit '1679b2c2e67f9accc58766a23ac852be762cff20':
  Ignore the volume hard keys in Volume settings screen.