OSDN Git Service

Merge changes I8ca219fa,Ia92d35b1
authorGreg Hackmann <ghackmann@google.com>
Tue, 2 Feb 2016 18:09:25 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Feb 2016 18:09:25 +0000 (18:09 +0000)
am: 5992e5fb6d

* commit '5992e5fb6da2722fb4c3850048f71ef077735381':
  socket.h: update AF_* constants
  Add adjtimex


Trivial merge