Jordan Liu e5c77fc978 Merge "WRITE_APN_SETTINGS is also required to read" ...

am: 0beefc0af5

Change-Id: I1ac69c71c7bdb39a9631da00a8bda89f7c1f0edd

2018-07-12 11:46:32 -07:00

..

java

Merge "Move XML object factory logic to libcore"

2018-07-12 11:26:03 -07:00

jni

Remove unnecessary libcore includes

2018-07-12 08:56:59 +01:00

proto

Merge "Added TestApi to ActivityInfo.isTranslucentOrFloating" into pi-dev

2018-05-26 02:23:25 +00:00

res

Merge "WRITE_APN_SETTINGS is also required to read"

2018-07-12 11:46:32 -07:00

tests

Merge "Java side setup and access to Binder Proxy Tracking"

2018-07-10 16:24:47 +00:00