OSDN Git Service

am de2781d9: Merge changes I01345c23,I3b57517c
authorElliott Hughes <enh@google.com>
Wed, 3 Jul 2013 20:39:16 +0000 (13:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Jul 2013 20:39:16 +0000 (13:39 -0700)
commita8b954c51edd9ec8c09a5d1dccacaadf5869d78a
tree255d570c57f70878ddafaee79b53afc24454f540
parentfac9199c7698481805dd9b1adaf89a2584719f4c
parentde2781d906f27be4df3e03a8e5041dcc1aeb281d
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.