tree 6faa2f32b2d707d5310569d4795905c96cd52cd1
parent b256f4d3483aa211d7137e0b8328e8f781656a8b
parent 6d35c7c7c222dc9bf36e534164a17dc4b4309ed9
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579019499 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579019499 +0000

[automerger skipped] Merge "Fix ModuleInfoProviderTest by passing correct flag" into qt-dev am: 5d612f02b8 am: 6d35c7c7c2 -s ours
am skip reason: Change-Id Icf93ca7dcf4fc2d7625fe7f9175c59200ae600b6 with SHA-1 b243197d96 is in history

Change-Id: I45e27192be2642ad022c8ff54b78b5512eb6714d