[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 7c33185b41

Browse Source

am: aefd756095 -s ours
am skip reason: subject contains skip directive

Change-Id: I9df474313df17c203d00428d783a371285026e9f

main

Xin Li 2019-07-02 16:24:42 -07:00 committed by android-build-merger

parent 2d7a031f4c aefd756095

commit 5d0822e4d5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available