Junyu Lai 555917c3b0 Merge "Add new callback to inform blocking of network on specific uid." am: f709e754ab am: 745952eac8 ...

am: 70626e3b94

Change-Id: I2bec503c5ffac156b679a48c09591458ab716789

2018-10-19 09:47:40 -07:00

..

java

Merge "Add new callback to inform blocking of network on specific uid." am: f709e754ab am: 745952eac8

2018-10-19 09:47:40 -07:00

jni

Merge "Update to EGL 1.5"

2018-10-18 23:33:45 +00:00

proto

[GraphicsEnvironment] Add whitelist support.

2018-10-16 12:54:38 -07:00

res

resolve merge conflicts of aad998c0b4 to pi-dev-plus-aosp

2018-10-18 13:44:22 +00:00

tests

Merge changes I86f597f1,I5c9c09dd

2018-10-19 15:21:54 +00:00