tree 73a037c78d28a8b081d1df5dc4100f3096dc42a6
parent 5625f360793b5ef03a49ae596ec09612fafea9a2
parent e011686c86d34d386fbfdf011aa9f7cf9c2b08a8
author Xin Li <delphij@google.com> 1602223574 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602223574 +0000

[automerger skipped] Skip ab/6749736 in stage. am: fd4abc5e72 -s ours am: 054a3f817f -s ours am: e011686c86 -s ours

am skip reason: Change-Id I876aaf6bba933c964a3573d8053cc60829b3a5fa with SHA-1 e9317d2d74 is in history

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

Change-Id: I1382e2d9bf9f50af71de6ed9fb626da927562bd1