Anton Hansson ed972116bb Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." into pi-dev ...

am: d740e43bf7

Change-Id: I938efe7a2359302cbf4d5d6f786f963044e1bbbd

2018-03-07 14:04:51 +00:00

..

java

Merge "Block adb from changing certain settings value when corresponding user restriction is on." into pi-dev

2018-03-07 13:54:19 +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 "Update strings that refer to the OS" into pi-dev

2018-03-07 00:11:33 +00:00

tests

frameworks/base: Set LOCAL_SDK_VERSION where possible.

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