tree d7cc1329cde5f6d2340ff9aa0d518637551b0555
parent fe8a9aedd21aa19939008e241cb72b7d5f435642
parent 479759618d1bd44337c2319905c3fbd0a96fdd54
author Paul Crowley <paulcrowley@google.com> 1537375045 -0700
committer android-build-merger <android-build-merger@google.com> 1537375045 -0700

[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