7340ea57fd0f4db0960f824ac2cb59b8386c99fb
6c3dac1f89
-s ours
am: f36b989635
-s ours
* commit 'f36b98963525aa96e6334f59ce83c3090cc186ce':
Import translations. DO NOT MERGE
Change-Id: Ib9a30be17b0c9b24803b16e57648a75e40db4c11
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev am:
a433fd2429
am: 7469d799a8
Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am:
b0054ec4e2
am: e8df0892d4
Description
No description provided
Languages
Java
89.8%
Kotlin
10.2%