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

Browse Source

am: f3420c999f -s ours
am skip reason: change_id Ic2faef44831575b2d03bc00ef2553d5c549adc95 with SHA1 f8905980dc 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 b7f02e19b0 f3420c999f

commit 0def675765

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