tree b20fe3fbd0d50ed5fee1f76ebacc1054acfe5747
parent 10e4fd56b5e86ca1a9a6bbcb4b62f6f4592bf508
parent 5da33dd67350fcb7c12a57027b1af5f4e72a9c21
author Elliott Hughes <enh@google.com> 1454537241 +0000
committer android-build-merger <android-build-merger@google.com> 1454537241 +0000

Merge "Really add adjtimex(2), and add clock_adjtime(2) too."
am: 5da33dd673

* commit '5da33dd67350fcb7c12a57027b1af5f4e72a9c21':
  Really add adjtimex(2), and add clock_adjtime(2) too.