tree 6ea15033e4ebc1bf2f9101a9fffd312c2915f6c7
parent 702583c95d30b0911acd5a8968209098a786aed6
parent 4cc826598cbd19ed97eeda02c72099653193f6c4
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587113940 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587113940 +0000

Merge "[automerger skipped] Rename external storage properties. am: 94abf26ba2 -s ours am: fc56249ab6 -s ours" into rvc-d1-dev-plus-aosp am: d8e1ff028c -s ours am: 4cc826598c -s ours

am skip reason: Change-Id I64c6d8ca49fbd72f923a8794df0929bd500dd8e9 with SHA-1 94abf26ba2 is in history

Change-Id: I1037d67ee5535327975a7c905f167f4be45cf759