am 949318a6: am ce50c681: am aeb199ab: Better layouts for security screen setups as part of b/7459863

* commit '949318a6f46225b367e04e5a7acd55011ebe8ad6':
  Better layouts for security screen setups as part of b/7459863
Merge "Import translations. DO NOT MERGE"
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
am d2380b8e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit 'd2380b8e2f783c96fcf55b69a9bb5e90a91b0af8':
  Import translations. DO NOT MERGE
am a62ac990: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'a62ac990a13fdb3f8e8e35dae30c2453cbe51cbc':
  Import translations. DO NOT MERGE
am 613b168d: am d2380b8e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '613b168df1eb569db9ed9d1345847fea1674b9b0':
  Import translations. DO NOT MERGE
am 1991ec83: (-s ours) am a62ac990: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '1991ec8386b7c85d20db290d9e414f1787198737':
  Import translations. DO NOT MERGE
am 1e9dea67: (-s ours) am 613b168d: am d2380b8e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit '1e9dea67c93b8791a60e201ecdb5b7372c82cec6':
  Import translations. DO NOT MERGE
Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev
am 300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev

* commit '300f8299a6085e295e288d535ad3b8fd0ccbb1cf':
  Revised language for notification ringtone picker.
am 5428ce65: am 300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev

* commit '5428ce650b161f5a4dfdccb2b4a54f18544e4068':
  Revised language for notification ringtone picker.
am 1c7c8242: am 5428ce65: am 300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev

* commit '1c7c8242ae946c102aca7737cd85ab743aabcb74':
  Revised language for notification ringtone picker.
Import translations. DO NOT MERGE

Change-Id: I950a025ffdb3ac8cb21a9e80175eef115ddac9d4
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I2ef0dc90375c2d1b8d341b2e747352d4a3313925
Auto-generated-cl: translation import
Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
am 9a2cee1d: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '9a2cee1d1e391147b3e21d10549b190ba79c4199':
  Import translations. DO NOT MERGE
am d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

* commit 'd2bd59f5e8e2359e6697dd8975ccfd1aa36b4103':
  Import translations. DO NOT MERGE
am e30adf2f: am d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev

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