Chalard Jean d1bf7733af Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478 am: e5e819f078 ...

am: 1be320a494

Change-Id: I9a9d0eb212f6de105abc070a1eb5ff698b4e67bc

2018-03-02 13:25:02 +00:00

..

java

Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: 6001f72478 am: e5e819f078

2018-03-02 13:25:02 +00:00

jni

Merge "Use destroy in transaction for animation"

2018-03-01 16:28:32 +00:00

proto/android

Merge changes I5c2facba,I2fecbeaa,I045ddf19,I961d190d

2018-03-01 02:06:40 +00:00

res

Merge "TURN OFF -> Turn off"

2018-03-01 17:57:21 +00:00

tests

Merge "DisplayCutout: Add xml wrapper for layoutInDisplayCutoutMode"

2018-03-01 13:57:22 +00:00