Michael Wachenschwanz 77a6283a5e Merge "Purge Nonexistent User Jobs on Boot" into oc-dev ...

am: a61f09f657

Change-Id: Ic96e165de9014b1d56ac322fcf2918458b1dd251

2017-05-17 19:10:44 +00:00

..

java

Merge "Purge Nonexistent User Jobs on Boot" into oc-dev

2017-05-17 19:10:44 +00:00

jni

Merge "Convert libmedia_jni to Android.bp" into oc-dev-plus-aosp

2017-05-17 15:17:19 +00:00

proto/android

strong fp lockout after 20 failed attempts

2017-05-12 13:01:01 -07:00

res

Merge "Fix TimePicker crash on rotation." into oc-dev

2017-05-17 18:23:34 +00:00

tests

Merge "Fix broken LoaderLifecycleTest#loaderIdentityTest" into oc-dev

2017-05-17 16:26:40 +00:00