tree 990b951a2ef1be0f63cd4ece1121b8339e1310f9
parent 9b2c085c47811715818f76bf6cde0ec4a7d9596a
parent ddf87aadb328fd16de6b0ab4fffe387bead96dce
author Elliott Hughes <enh@google.com> 1479328773 +0000
committer android-build-merger <android-build-merger@google.com> 1479328773 +0000

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

Change-Id: I22d67e091a865da71de83c28555795fb4ad89438