tree 1741a172d5c78dc10eb7ad0b428ad06e313127c6
parent abf77f1c1c28f21452dccbf2c83ec61211a4f5aa
parent 6d944bcc8bbd57777e8b292a1606d620118253eb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1589931211 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1589931211 +0000

Merge "Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56" into rvc-d1-dev-plus-aosp