Joe Onorato 458fd79af1 Merge "Fix another copy and paste of the copy and paste error." into qt-dev am: 786705d0ab ...

am: 80ca5b18b1

Change-Id: I5709f285bce704d9b560502d6c5f644675de3279

2019-05-10 20:10:08 -07:00

..

java

Merge "Fix another copy and paste of the copy and paste error." into qt-dev am: 786705d0ab

2019-05-10 20:10:08 -07:00

jni

Merge "Replace Skia font macros with enums."

2019-05-10 13:44:32 +00:00

proto

Merge "Add logging enums for slice converter exceptions" into qt-dev am: 2e761ef06c

2019-05-09 13:38:28 -07:00

res

Merge "Fail to enable rollback if enable rollback times out" into qt-dev am: b273078adf

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

tests

Merge "Add secure setting for Global Actions Panel debug mode." into qt-dev am: 0cde819fc6

2019-05-10 19:02:14 -07:00

xsd

…