Evan Laird 3f3aa3518f Merge "Use disableForUser in StatusBarManager" ...

am: 5392d799ab

Change-Id: I346f8a17d43e65c6e9ed362942345146ad6cac1d

2018-06-13 08:56:41 -07:00

..

java

Merge "Use disableForUser in StatusBarManager"

2018-06-13 08:56:41 -07:00

jni

Merge "Framework: Disable native-bridge for non-zygote"

2018-06-11 09:11:28 -07:00

proto

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

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

res

Merge changes from topic "ipsec-sync-with-pi"

2018-06-08 17:07:11 +00:00

tests

Merge "Simple pass-through TimeDetectorService"

2018-06-12 11:17:51 -07:00