OSDN Git Service

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

1  2 
MetadataCrypt.cpp

Simple merge