tree 5dc15fc37ae4cf2b2ea6424ae6321c470dc81601
parent d4645eb831e31e0629aff897983cfa97e4084543
parent d8e1ff028c4922bdeff6ce415d03f8199c69deb2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587113105 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587113105 +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 skip reason: Change-Id I64c6d8ca49fbd72f923a8794df0929bd500dd8e9 with SHA-1 94abf26ba2 is in history

Change-Id: I8de53b56df9a9c8f5c138c01fdb60106f0d71606