Annie Meng 886c797727 Merge "Validate restore of NetworkPolicy settings" into pi-dev ...

am: 292d895fb2

Change-Id: I0337e151e8a47d413153160081e640b49f945318

2018-03-07 17:17:54 +00:00

..

java

Merge "Validate restore of NetworkPolicy settings" into pi-dev

2018-03-07 17:17:54 +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 "System sounds get its own dnd toggle" into pi-dev

2018-03-07 16:39:40 +00:00

tests

frameworks/base: Set LOCAL_SDK_VERSION where possible.

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