tree 8f5b5a122a97781db19419610d90bdfbc0fde196
parent a588c14e26a11298aa8ba95288e2da8efdd24cce
parent 3e3ada4ff3219136e929dd433bf6161c2c3c06e4
author Christopher Ferris <cferris@google.com> 1632273361 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632273361 +0000

Merge "Update allocator alignment tests." am: 258642b7d7 am: 3e3ada4ff3

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1832879

Change-Id: Ideb189faf22f38bbe0be7721caaed3360ef00561