tree 6ea15033e4ebc1bf2f9101a9fffd312c2915f6c7
parent 644bc66d2875482ee34c71fbbbb8d61a421455e8
parent d4645eb831e31e0629aff897983cfa97e4084543
author Martijn Coenen <maco@google.com> 1587113915 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587113915 +0000

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

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

Change-Id: If18f39ab56a0cca265d07442b5f96a22b4857301