tree 75a741348ef10fa46dca98b9b83120a18a00a344
parent 151a2bcee71b5624fefca0e01d24bd3df9c78769
parent 8bca87a027d34962d0fb2283d6d408ee09b00472
author Treehugger Robot <treehugger-gerrit@google.com> 1596150386 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596150386 +0000

Merge "Use blocklist sub-property in sanitize" am: 2b48a52398 am: 8bca87a027

Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/1375199

Change-Id: I24643fae4ea0d0f27cc206fe1cc492c0324fcbdc