tree 0bfbe93fa5c034805517490b5eedebe64421f9ff
parent 6e3874688f51914d7da9982bcd350ed6464843ed
parent 01b59992b1fd12a0ad057fe06492fd669442830b
author Treehugger Robot <treehugger-gerrit@google.com> 1587683082 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587683082 +0000

Merge "vold: fix missing has.adoptable" am: 9e2053e185 am: d4e75c211d am: 01b59992b1

Change-Id: I912bf88877f892450eb0389c1c2679180c0b5181