tree f3672176b9da318b17f1be56d93d7e8662328876
parent 0caeeb28ec3f979a496af7ee8179b30a1813365e
parent 169df0caa5558f8f1ee868a032e2c7e8df146cae
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1684294369 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1684294369 +0000

Merge "Fixing test failure on hwasan builds" am: 855810c4e9 am: 6407abc8c9 am: 169df0caa5

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

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