[automerger skipped] Merge "Support importing property file with expanded name" into qt-dev am: fa94b8f96b

Browse Source

am: ca11f4699c -s ours
am skip reason: change_id If3fdcf620a5d717e0930b1e4e58261bc8f79ec24 with SHA1 ea9e783b4b is in history

Change-Id: I0985f7b522d324d9757ad2c7126e351eac92ed81

...

This commit is contained in:

Dongcheol Shin 2019-06-17 16:12:13 -07:00 committed by android-build-merger

parent 2f9d91bde6 ca11f4699c

commit ff5f483b3d

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