[automerger skipped] Merge changes from topic "niap-vpn" into qt-dev

Browse Source

am: 067b9dc406 -s ours
am skip reason: change_id Ic2faef44831575b2d03bc00ef2553d5c549adc95 with SHA1 4469b1d8a5 is in history

Change-Id: I4775263c2f422a9738812b02be61e2af95e9c472

...

This commit is contained in:

Lorenzo Colitti

2019-04-24 23:02:31 -07:00

committed by android-build-merger

parent 57805e1a6e 067b9dc406

commit af3e5679cf

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

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

Diff Content Not Available