tree 0fb1fc039d91e55eaa868c43cedee3e0cdbfaee7
parent ae2450e340685fac4612249658e8438c6f20535d
parent 301d51ceb6e85050be15dcbce15b2c2c3b1cfe0a
author Martijn Coenen <maco@google.com> 1587030507 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587030507 +0000

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

Change-Id: I546a2d8c351293b7f07505bea1df77ac84f4475e