Makoto Onuki 80cd503cf3 Merge "Avoid service wrapper initialization deadlock." into pi-dev ...

am: 1e36211a96

Change-Id: I1413c9f37c6ae189292def463e1621983e2f87f2

2018-03-07 18:33:12 +00:00

..

java

Merge "Avoid service wrapper initialization deadlock." into pi-dev

2018-03-07 18:33:12 +00:00

jni

Merge "AID: Change loop to repeat and set from xml"

2018-03-05 01:23:19 +00:00

proto/android

Add APP_AUTO_RESTRICTION_ENABLED

2018-03-06 21:33:37 +00:00

res

Merge "Remove BIND_SLICE" into pi-dev

2018-03-07 18:01:26 +00:00

tests

frameworks/base: Set LOCAL_SDK_VERSION where possible.

2018-03-07 11:42:04 +00:00