tree 90a315ce9e1606ac4c4b3062cea18bd8980ef917
parent 0c0ed9d6b5a503da8dd5cba5776dece0601b69ed
parent 30c1b0225e2220c29d9049689c605d3c5c748122
author Paul Crowley <paulcrowley@google.com> 1586232512 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586232512 +0000

Merge "Choose options format using property" am: 479588c68e am: 30c1b0225e

Change-Id: Id82ce73849059e7792422023afc66cba13833ecc