| commit | 6f4e2cf604c8dd63f8ec5f68092742a8ab6e3c20 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Feb 22 01:49:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 22 01:49:57 2017 +0000 |
| tree | 139d6bad7cc342728aadcb9c5bacbde4f35c50ea | |
| parent | a119bcc8f631ce5290c1741766561fe73d3ca040 [diff] | |
| parent | 6bbdfa326005a084f79d1d53a4920dc2c0506fa1 [diff] |
Merge "Add timeout support to android::base::WaitForProperty." am: ff692a5ace am: 6bbdfa3260 Change-Id: I72b4839593fe67be88ba5ff5dd95822af8f8d819