tree e6bf492fdd3c8a429c5d12598947bfbe1654ed36
parent dd8f40625dcd00f952d1da9287e655570117f0fb
parent 27bbe8bfb224ae4bf11f0dea58f26a975e67ef74
author Josh Gao <jmgao@google.com> 1479335849 +0000
committer android-build-merger <android-build-merger@google.com> 1479335849 +0000

Merge "adb: add sysdeps/chrono.h for chrono literals on Win32." am: e631e470e0
am: 27bbe8bfb2

Change-Id: Ib5069a8811f8c5e4b21cc849f9e57c4c4d488276