tree 16022a61077ef4fb619d89f5240d7a2bc0077f9d
parent a5b93f1c0b198855a57d876d4ab0b74613954555
parent a8e1303bdb7f91dd72ff2cb090dfb053e3fe480b
author Inseob Kim <inseob@google.com> 1652405980 +0000
committer Inseob Kim <inseob@google.com> 1652406279 +0000

[conflict] Allow dumpstate prop to R vendor's allowlist am: a8e1303bdb

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

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