commit | afa5bef59348f3f1a8f54abc14da75f8ce69b653 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Wed Feb 22 01:52:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 22 01:52:28 2017 +0000 |
tree | 815417a73a40d177a9a97e881f0993bd69ea8c88 | |
parent | 8a339469c8f100c7d98dd463a20d58fab886170a [diff] | |
parent | 6a032fb6f89ef84d91ac3f6f4ea7e2a8377d1b4f [diff] |
Merge "Add timeout support to android::base::WaitForProperty." am: ff692a5ace am: 6bbdfa3260 am: 6f4e2cf604 Change-Id: I159037a0fc54831494ce9f4e3dcf2b4237afd9d3