diff options
author | Elliott Hughes <enh@google.com> | 2018-02-05 23:33:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-02-05 23:33:57 +0000 |
commit | 6c30932089dfefe5d01862af70dde3bbea9a0414 (patch) | |
tree | 24149efc78d3b4a70692bbc719ae5662ba49693c /libc/malloc_hooks/malloc_hooks.cpp | |
parent | c6bfb6b9491097c1103221d9de30f5868bb5e586 (diff) | |
parent | a70089163ca09a983772dd2a8daa17e47f8ede53 (diff) |
Merge "Avoid trademarks."
am: a70089163c
Change-Id: I3e247f9f978b6e2b26e5219e9a315444f9cdb8c5
Diffstat (limited to 'libc/malloc_hooks/malloc_hooks.cpp')
0 files changed, 0 insertions, 0 deletions