tree c1a3876b58eb5cb4fd19fb6a21c97f6bc098c1cf
parent 6167310291c0696bbc8aa0f28de447cd3f65c7c0
parent db1154a8f5b6076c707d2f8bce1b6cd7fe7d1eb3
author Treehugger Robot <treehugger-gerrit@google.com> 1599821663 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599821663 +0000

[automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: f7794b5dc1 am: 5724e15454 -s ours am: 95177aab00 -s ours am: db1154a8f5 -s ours

am skip reason: Change-Id Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424 with SHA-1 44b2f954be is in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1400407

Change-Id: I7f72ed45082e2e5f84e18f30cadc511bd68fda9b