[automerger skipped] [GUP] Hard code the name of the whitelist file. am: be09eef818

am: 7d1d0c4f63 -s ours
am skip reason: change_id Ibe9337b358b6a67600048f1661d73574d7bea607 with SHA1 3a1be746c0 is in history

Change-Id: If342de345315b97a79917fc1a8a59c94f58eb7d5
This commit is contained in:
Peiyong Lin
2019-04-17 14:33:46 -07:00
committed by android-build-merger

Diff Content Not Available