Josh Gao 036d594c69 Merge changes I8bdb4c74,I613a7d03 into qt-dev ...

am: a09ee2d39f

Change-Id: I6ae25d6b3aa39ef6f9ed1ffcf6fce6e5920a5578

2019-07-25 16:54:20 -07:00

..

java

Merge changes I8bdb4c74,I613a7d03 into qt-dev

2019-07-25 16:54:20 -07:00

jni

skip reading vmallocinfo if not needed

2019-07-10 01:41:04 +00:00

proto

Add gesture touch counts

2019-06-28 14:23:58 -04:00

res

Import translations. DO NOT MERGE

2019-07-24 21:29:51 -07:00

tests

Merge "Redact ISOBMFF boxes with 'free'" into qt-dev

2019-07-11 06:26:42 -07:00

xsd

…