tree b19781433c09a42fe72249da311051571cc14369
parent 68f469d8d539156fde7779483c72e71e2e3d706c
parent 9e8311faec4a7be43200cdeb2e0b317c8feb12b1
author Valerie Hau <vhau@google.com> 1596073309 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596073309 +0000

[automerger skipped] RESTRICT AUTOMERGE: Fix security bug am: 01f9863464 -s ours am: d07402fc46 am: 431955c576 -s ours am: 9e8311faec

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

Change-Id: I9bfefe2cefaa0e437302ac3a9e746eb89201948f