tree 63fd07dd533dc883a6ea8a9622f06f6e1b5c784e
parent b2f5bfcfc20bb60b89c86fdced5f99eaa55d6012
parent 9b63f4e90402547b88f7a530304d20fa20b7eafb
author Elliott Hughes <enh@google.com> 1595009768 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595009768 +0000

Merge "Zygote: Add Arm pointer authentication keychange support." am: 285dfb3126 am: 9b63f4e904

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1215821

Change-Id: Iaf318313dcf27a6cb5a5ff3c45bb6220b9d03faf