tree 89a6364067ec5a52cbdb024d314c2695509c79e1
parent 032e051659dae97e7ecdf11f7be509e3091a6556
parent cb1ca01e1dfae39874bceaba297b07d5bb27aaec
author Inseob Kim <inseob@google.com> 1652409155 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1652409155 +0000

[automerger skipped] [conflict] Allow dumpstate prop to R vendor's allowlist am: a8e1303bdb am: f28026f329 am: cb1ca01e1d -s ours

am skip reason: skipped by user inseob

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/security/+/2097397

Change-Id: Ib16daa61d4f4fd1df8e9fbbc1793afe2f966f1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>