tree 0fb1fc039d91e55eaa868c43cedee3e0cdbfaee7
parent 5545908ba842d4e2a5ac318de781cc7c9cd8bf6b
parent 1e5918cd752e5c098c891ecfc1af4b955b2caf76
author Martijn Coenen <maco@google.com> 1587029683 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587029683 +0000

Merge "Rename external storage properties." am: 014e1d7b06 am: 7a530e102d am: 7323ae7f90 am: bfb67c0dd7 am: 1e5918cd75

Change-Id: I975ea5b2c7c91049d7d54230977add188dcf70e0