Chalard Jean 55f12784b8 Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ... am: 6c0106b57f am: 85bae863f5 ...

am: d118c2b444

Change-Id: I19197e4bdc44d46e31c1e931e0e7b252f0b6bfa4

2018-06-12 07:39:54 -07:00

..

java

Merge changes I6abd2221,I2c149d29,I45d22857,I1f879b2c,If4986a25, ... am: 6c0106b57f am: 85bae863f5

2018-06-12 07:39:54 -07:00

jni

Merge "Framework: Disable native-bridge for non-zygote" am: 05c09faad2 am: 5b2e5d32d6

2018-06-11 09:36:14 -07:00

proto

Add a setting for the User Absent, Touch Off feature in Wear

2018-06-07 16:11:34 -07: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 09:49:33 +00:00