tree fe437b8231b30806b35f6b7c06a39818c78d1831
parent bf6f3dec9fcf81ec8938a84451a13e72ff60e671
parent 01f9863464fb07aea1f7f2180ec4eb76ab7e25ed
author Valerie Hau <vhau@google.com> 1596069611 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596069611 +0000

[automerger skipped] RESTRICT AUTOMERGE: Fix security bug am: 01f9863464 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12182445

Change-Id: I1b01642c20c96c5bc9cd32d867bb1c338ca13d8f