Josh Gao 1fad55e868 Merge changes from topic "bionic_fdsan_java" ...

am: bb352287c9

Change-Id: Ib6c5ac9ffc7f9aa88749af1c0d66880a1c98a650

2018-07-20 21:14:33 -07:00

..

java

Merge changes from topic "bionic_fdsan_java"

2018-07-20 21:14:33 -07:00

jni

Merge changes from topic "bionic_fdsan_java"

2018-07-20 21:14:33 -07:00

proto

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

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

res

Merge "Correct Telus gid"

2018-07-20 11:43:20 -07:00

tests

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

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