tree 6a4061c9eacacc48173a47b2f5bf63fa9343093f
parent d3471e0ca9326d931a71ac8ba8052bc5e7086531
parent 13184494473305b6c2ce77a677b4c36204212354
author Steven Moreland <smoreland@google.com> 1596568467 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596568467 +0000

Merge "SCUDO fill options only when USE_SCUDO" am: 7591bb5ee1 am: ef9986013b am: d5115d9b35 am: 656345ecf0 am: 1318449447

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

Change-Id: I8e1759796c0974daa4b1ab1a05b7ca11f2692dba