diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-03 13:39:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-03 13:39:16 -0700 |
| commit | a8b954c51edd9ec8c09a5d1dccacaadf5869d78a (patch) | |
| tree | 255d570c57f70878ddafaee79b53afc24454f540 /libc/malloc_hooks/tests/malloc_hooks_tests.cpp | |
| parent | fac9199c7698481805dd9b1adaf89a2584719f4c (diff) | |
| parent | de2781d906f27be4df3e03a8e5041dcc1aeb281d (diff) | |
am de2781d9: Merge changes I01345c23,I3b57517c
* commit 'de2781d906f27be4df3e03a8e5041dcc1aeb281d':
Include linux/termios.h from sys/ioctl.h.
Update linux/types.h to linux 2.6.20.
Diffstat (limited to 'libc/malloc_hooks/tests/malloc_hooks_tests.cpp')
0 files changed, 0 insertions, 0 deletions