OSDN Git Service

Merge "ART: Fix missing CLOCK_MONOTONIC on Mac" am: 442a83a762
authorAndreas Gampe <agampe@google.com>
Tue, 17 Jan 2017 23:24:48 +0000 (23:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jan 2017 23:24:48 +0000 (23:24 +0000)
commitfed07c2894805c99af5f981fada00f0e3f9ef85d
treee8805b7f1dbb6b4de9d27aac51469a5934646d9e
parent31ce876f11d28b6483389c822b2626f65dbd29af
parentd199dafabcc6a2086d38ef6563456cd946ca82bf
Merge "ART: Fix missing CLOCK_MONOTONIC on Mac" am: 442a83a762
am: d199dafabc

Change-Id: Ib8665e14bdc3c54959a625f09674b5ac85101707