tree 6a4061c9eacacc48173a47b2f5bf63fa9343093f
parent 202c7ad1d55754ec14e21b9b075c80ea13a50744
parent ef9986013bdfdd499071710e8079e842a831b45c
author Steven Moreland <smoreland@google.com> 1596565154 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596565154 +0000

Merge "SCUDO fill options only when USE_SCUDO" am: 7591bb5ee1 am: ef9986013b

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1381396

Change-Id: I909007bab43a9d21db269f8509bb59d735d220a7