Neil Fuller a3aa3221bf Merge "Simple pass-through TimeDetectorService" am: cb749e2e50 ...

am: 415585f2a5

Change-Id: Id0259be3d9ad4e869c5e96cb166b8654d52c1ad7

2018-06-12 11:26:56 -07:00

..

java

Merge "Simple pass-through TimeDetectorService" am: cb749e2e50

2018-06-12 11:26:56 -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