Roozbeh Pournader b7d308df0f Merge "Remove Tigrinya (ti) from Settings languages" into oc-dr1-dev am: d5b776c721 ...

am: de8185aa2f

Change-Id: Ia7660a91d958ae4d2a12735f7446bbaac860e5dc

2017-07-18 23:55:32 +00:00

..

java

Merge "Disable lock screen by default for demo users" into oc-dr1-dev am: 205585e574

2017-07-18 23:40:43 +00:00

jni

Merge "Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23c5 am: d2bf323c40 am: 238be4a67b" into oc-dr1-dev-plus-aosp

2017-07-18 22:05:50 +00:00

proto/android

…

res

Merge "Remove Tigrinya (ti) from Settings languages" into oc-dr1-dev am: d5b776c721

2017-07-18 23:55:32 +00:00

tests

Merge "Disable lock screen by default for demo users" into oc-dr1-dev am: 205585e574

2017-07-18 23:40:43 +00:00