tree d2966e1e4d5647b99872bd327a3d26d6197616dd
parent 60579b88ebb568ccd11791e3a9ed00673f76043c
parent f466c1eeb5c26f36de56d6bfb64dad0e48bf14ee
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578684918 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1578684918 +0000

[automerger skipped] Merge "Fix ModuleInfoProviderTest by passing correct flag" am: 8670b8b2bc am: 59c9cf770b am: f466c1eeb5 -s ours
am skip reason: Change-Id Icf93ca7dcf4fc2d7625fe7f9175c59200ae600b6 with SHA-1 be7417db93 is in history

Change-Id: I7ef58c9111f2652e45b429f658e7cc4f59666953