Jeff Sharkey 64a615eefe Merge "Extend adoptable override to force on or off." into pi-dev ...

am: 130a2503d8

Change-Id: Ic5bb21ec16f4603d87b5b659f041ee0a08b8d039

2018-04-20 17:20:16 -07:00

..

java

Merge "Extend adoptable override to force on or off." into pi-dev

2018-04-20 17:20:16 -07:00

jni

Merge "Set default reference ID" into pi-dev

2018-04-18 15:12:08 -07:00

proto

Merge "Add setting for GNSS location request update duration" into pi-dev

2018-04-18 18:10:04 +00:00

res

Merge "Fix issue with translucent animations" into pi-dev

2018-04-20 15:47:54 -07:00

tests

Merge "Don't require post-execution state for onActivityResult" into pi-dev

2018-04-20 17:10:42 -07:00