tree 5dc15fc37ae4cf2b2ea6424ae6321c470dc81601
parent a59455074ec0e088fac1f9abbe28a1c930a73756
parent e326e59ddea18cdd18c5cd8ee5faef9fae636cc6
author Martijn Coenen <maco@google.com> 1587111853 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587111853 +0000

[automerger skipped] Rename external storage properties. am: 94abf26ba2 am: e326e59dde -s ours

am skip reason: Change-Id I64c6d8ca49fbd72f923a8794df0929bd500dd8e9 with SHA-1 5a4a7fffb7 is in history

Change-Id: I34eb535a8691b04e2cb57ffb7fe6e4a4938414fe