Elliott Hughes 646d65cd48 Merge "Merge "Track libziparchive API change." am: 32581e1dd2 am: 78791cd8d7" into qt-dev-plus-aosp ...

am: 40358393fa

Change-Id: I02d8f5a7c8a4e255927e751591354415954c83a7

2019-05-06 19:50:38 -07:00

..

java

Merge "Collects metrics for the new Sharing Shortcuts api" into qt-dev

2019-05-06 17:39:00 -07:00

jni

Merge "Merge "Track libziparchive API change." am: 32581e1dd2 am: 78791cd8d7" into qt-dev-plus-aosp

2019-05-06 19:50:38 -07:00

proto

Merge "Add Locale#script to Configuration proto." into qt-dev am: cc1159a166

2019-05-06 12:43:31 -07:00

res

Merge "Update path to audio files" into qt-dev am: e0b7cce0c7

2019-05-06 12:53:36 -07:00

tests

Merge "OMS: limit shell command output via optional args" into qt-dev am: c283f6100d

2019-05-06 15:34:08 -07:00

xsd

…