am 7bb1c807: Merge "Settings: PT-BR translation fix"

* commit '7bb1c807bfecc1ab34203b90942529aa24611362':
  Settings: PT-BR translation fix
am b96b35a6: Enable back in CryptKeeper

* commit 'b96b35a62b1f092b6322643c3568f3e712543e53':
  Enable back in CryptKeeper
am 81d7a806: Do not reuse master_clear_gesture_* strings for credential installation confirmation

* commit '81d7a806a6403cd98a0c6dd0ba7288d728382144':
  Do not reuse master_clear_gesture_* strings for credential installation confirmation
am 299ed152: (-s ours) Merge "Wifi: Update message when scan result is empty"

* commit '299ed15213796bbcb953db12479b74a7c024e2c6':
  Wifi: Update message when scan result is empty
am 7706a2a1: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '7706a2a1432a67720e3f7906647c3c0d2afbfb8b':
  Import translations. DO NOT MERGE
am de3c9cb4: Notify user when waiting for decryption password

* commit 'de3c9cb412688eb841993ad971d06039d8a952c3':
  Notify user when waiting for decryption password
am 9593b743: Merge "Fix NPE in ManageApps when switching orientation." into jb-dev

* commit '9593b743cb625e88b97b2674c5f528bb07f96011':
  Fix NPE in ManageApps when switching orientation.
am 4b57e6e4: Import translations. DO NOT MERGE

* commit '4b57e6e451806e4f4f78548f1ad7bc1929ec7b5b':
  Import translations. DO NOT MERGE
am a3c3bf1d: Merge "Notification alert every 5s and start after 30s." into jb-dev

* commit 'a3c3bf1dee34940ade909306486a9bb12c75b8b7':
  Notification alert every 5s and start after 30s.
am 277cf8cc: Merge "Include the clock in landscape on Xoom" into jb-dev

* commit '277cf8cc5b1481ff59a760f712f3892229023329':
  Include the clock in landscape on Xoom
am b3c17c57: Merge "Removing static reference from sUnknown"

* commit 'b3c17c570a6c26ece11b404a5918ce4bd64a0940':
  Removing static reference from sUnknown
am c62d321e: UI fixes for tablets

* commit 'c62d321e8dcb023e8c7299802a75a271b7ca98d9':
  UI fixes for tablets
am d86d44b7: Merge "Fall back to Wi-Fi data when SIM missing." into jb-dev

* commit 'd86d44b7453e60f8dc40d61aa4a7c859bb6efa07':
  Fall back to Wi-Fi data when SIM missing.
am 0cdc3a1e: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit '0cdc3a1e166b8547a2fe1a97fbe9064a3ae6c879':
  Import translations. DO NOT MERGE
am 8517794f: Merge "Always on the valid system default ime" into jb-dev

* commit '8517794f1b097cf5c073d81bc6f73fe0b90d01bd':
  Always on the valid system default ime
am 69801b36: Merge "RadioInfo: Update the network type listing"

* commit '69801b36a1e2b8d5bede15683dceda076e271e67':
  RadioInfo: Update the network type listing
am d8a18ad8: Merge "Better messaging when Wi-Fi disabled." into jb-dev

* commit 'd8a18ad87e930bbcd203ef65563546f13b9bbb8b':
  Better messaging when Wi-Fi disabled.
am 37dfc0c1: Merge "Avoid animation flashing and fix padding." into jb-dev

* commit '37dfc0c1acc675723e2fb48488e75a72003d63c9':
  Avoid animation flashing and fix padding.
am 8b399cc7: Merge "Go into airplane mode in minimal boot mode." into jb-dev

* commit '8b399cc71c960db05aa804c7e982709a1af5502d':
  Go into airplane mode in minimal boot mode.
am b9d0f3cb: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit 'b9d0f3cbb5e8aaf868760db6274592619316debc':
  Import translations. DO NOT MERGE