tree 3a8b1c4e6e25ea35ec296cb309e988a79ed80b03
parent 10b6c413bc4040265d9cf6532b1ab97d3129b0ed
parent beeafcd9a08682077dc086fe1d96dee6f3b60fd2
author Peter Qiu <zqiu@google.com> 1445532047 +0000
committer android-build-merger <android-build-merger@google.com> 1445532047 +0000

Merge "Enable HAVE_MONOTONIC_CLOCK compiler flag"
am: beeafcd9a0

* commit 'beeafcd9a08682077dc086fe1d96dee6f3b60fd2':
  Enable HAVE_MONOTONIC_CLOCK compiler flag