[automerger skipped] Merge "Make makevars deterministic" into qt-dev

am: 5cd481adde -s ours
am skip reason: change_id I4153977705da05a5c73e641f93d02f408209c897 with SHA1 91268c668c is in history

Change-Id: I4bdc6ccd4d9b688d4dd7a7faa170d33b9f8f8d98
This commit is contained in:
Colin Cross 2019-04-16 19:25:47 -07:00 committed by android-build-merger
commit 54f4042eae

Diff Content Not Available