[automerger skipped] Merge "vold: metadata encryption: ensure F2FS GC targets correct device." am: 3adf30745a am: 61ab6986a6 -s ours

am: 479759618d  -s ours

Change-Id: Ib483e983a9e80e97f892ff08594c6e4b73acd990
This commit is contained in:
Paul Crowley 2018-09-19 09:37:25 -07:00 committed by android-build-merger
commit d6366c79c8

Diff content is not available