OSDN Git Service

Merge "Choose options format using property" am: 479588c68e am: 30c1b0225e am: 7f076f9142
authorPaul Crowley <paulcrowley@google.com>
Tue, 7 Apr 2020 04:29:39 +0000 (04:29 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 7 Apr 2020 04:29:39 +0000 (04:29 +0000)
Change-Id: I5e91aeeee4a64704ffe9ad5a425e91065e18d8e2


Trivial merge