tree b03a534436f695416fb9ddcce545cc823ca6e47a
parent 2b7398009198a8eedc019ba706977300fc847fb9
parent bd51a0d30dd7a5a7873d07ff5177ed3ec3269278
author Elliott Hughes <enh@google.com> 1479328162 +0000
committer android-build-merger <android-build-merger@google.com> 1479328162 +0000

Merge "Switch adb over to <chrono>." am: 59826ddee5 am: 2278b50f24
am: bd51a0d30d

Change-Id: I5371f94c6b5adc626bdd5bc322b183dcb6ab40f3