Merge "Import translations. DO NOT MERGE"
am f4ce8c93: Import translations. DO NOT MERGE

* commit 'f4ce8c937ea54fbee1fe38f858fc065d78c57214':
  Import translations. DO NOT MERGE
am fe8b3e9a: (-s ours) am f4ce8c93: Import translations. DO NOT MERGE

* commit 'fe8b3e9a6062411d9ce7c97c1499915e5afb9dfb':
  Import translations. DO NOT MERGE
Merge "Switch VPN to use keystore ENGINE"
Merge "Update Wifi to use new keystore function"
Merge "Convert to new KeyStore format"
merge in jb-release history after reset to master
Only enable multi-user settings if a secure settings flag is set

Use a secure settings key of "multiuser_enabled" that can be
set to "1" to enable the multiuser panel in Settings.

Change-Id: I37d96f6055bc7f87ef271ebdc58f16e7dcecca7b
Import translations. DO NOT MERGE

Change-Id: I50a666daa881741b7d5cbbb904ddd2d7c68e9771
Fix discovery state tracking

Use the new intent to track if we are in discovery state

Change-Id: I9e07c3ccfcf62c3c33195d23c94de60d4248670c
Merge "Only enable multi-user settings if a secure settings flag is set"
merge in jb-release history after reset to master
Merge "Fix discovery state tracking"
Import translations. DO NOT MERGE

Change-Id: I5db9914730e86cd35b9098780e66c472c84aeadb
Import translations. DO NOT MERGE

Change-Id: Iea14f3c10b2730b43740e4fa73eba834699c1c6c
am 841ad7ba: Import translations. DO NOT MERGE

* commit '841ad7ba7f71589f9ca976a5b5b8535e3458a810':
  Import translations. DO NOT MERGE
am f8512644: (-s ours) am 841ad7ba: Import translations. DO NOT MERGE

* commit 'f85126443db3760a994edeb2cb595ff6de0e0a8f':
  Import translations. DO NOT MERGE
Minor changes to improve CryptKeeper readability

Change-Id: I8a056216edf7f557c32bdec9387b0d31de7aa6c6
Changed text for "accessibility script injection" preference.

Change-Id: I8afc786f47b88bde3212f38683c813771e70af6b
Import translations. DO NOT MERGE

Change-Id: I6a07131c3025acbb574d3add8ead6f272fd0d942