tree 624741d45a3dd6d227434949ce22e8afe6eb0658
parent 09736053ba6cae3d1e45a1a2b9676a6d1629c66c
parent a87b9287a4801ce39f30dbd84c3eac2f66c99992
author Nick Kralevich <nnk@google.com> 1450509201 +0000
committer android-build-merger <android-build-merger@google.com> 1450509201 +0000

Merge "common_time_server.cpp: more O_CLOEXEC" am: 78d5f90d98
am: a87b9287a4

* commit 'a87b9287a4801ce39f30dbd84c3eac2f66c99992':
  common_time_server.cpp: more O_CLOEXEC