tree 6ea15033e4ebc1bf2f9101a9fffd312c2915f6c7
parent 793eb7db935beb2f855ec88b9d8db4082afb1ebc
parent 702583c95d30b0911acd5a8968209098a786aed6
author Martijn Coenen <maco@google.com> 1587114622 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587114622 +0000

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

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

Change-Id: I47011d5355452d43b449397b422c4d8d4104127a