diff options
author | Diego Wilson <diegowilson@google.com> | 2018-12-20 16:08:19 -0800 |
---|---|---|
committer | Diego Wilson <diegowilson@google.com> | 2018-12-20 16:08:19 -0800 |
commit | 946944683f8d2a954b0a34744f6a4de55d29c0ab (patch) | |
tree | bc7960404c9f5fb31e1d911aeef3bd1b4c1eca6e /libc/malloc_hooks/malloc_hooks.cpp | |
parent | c91e7e33876931409ee0d6780618d38a6e24d36f (diff) | |
parent | 0182c4a48982ec0f2a3f3b53fa215b0a89f042b9 (diff) |
Merge p-keystone-qcom
Conflicts:
libm/Android.bp
libm/sincos.c
Change-Id: Iae57a9d9673b31c5d47fb35ea0fbd3f495bbf522
Diffstat (limited to 'libc/malloc_hooks/malloc_hooks.cpp')
0 files changed, 0 insertions, 0 deletions