Jeff Sharkey 145181dae3 Merge "Cache resolved details about remote callers." into qt-dev am: 04e5f7acff ...

am: f20245ae50

Change-Id: Ib6c4734cf3c34092325256187459c1a081ac3599

2019-05-16 07:10:19 -07:00

..

java

Merge "Cache resolved details about remote callers." into qt-dev am: 04e5f7acff

2019-05-16 07:10:19 -07:00

jni

resolve merge conflicts of 40654b7696 to qt-dev-plus-aosp

2019-05-16 05:15:15 +00:00

proto

Merge "Remove keys from adb_keys after period of inactivity" into qt-dev

2019-05-10 22:54:54 +00:00

res

Merge "Update timeout string" into qt-dev

2019-05-15 23:24:09 -07:00

tests

Merge "Revert "MemoryIntArray: track the owned file descriptor in a PFD."" into qt-dev

2019-05-13 15:59:27 -07:00

xsd

…