diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-12 00:32:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-12 00:32:52 +0000 |
| commit | e30b026c0011a53550dcb2840740e2d23bcd80f1 (patch) | |
| tree | 93d699e33848416768e81412a3b42677c161c6d4 /libc/bionic/heap_zero_init.cpp | |
| parent | d55f2ce1efba752b39706ffc97fcd749e8c82cd7 (diff) | |
| parent | 07e5f91fc6bb94946f7557446d164025b5c62761 (diff) | |
Merge changes from topic "am-243d83f2e1834512a5f6c07cae7c3ce2" into android12-tests-dev
* changes:
Merge "[automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours" into android11-tests-dev am: 98b842fce6
[automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours am: 7fad99971d -s ours
Diffstat (limited to 'libc/bionic/heap_zero_init.cpp')
0 files changed, 0 insertions, 0 deletions