| commit | 6a032fb6f89ef84d91ac3f6f4ea7e2a8377d1b4f | [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 | 9f8be8c9e27db70a9e4afec9cee2dea55fdba1aa [diff] | |
| parent | e3f795b9e7f78372e26e34e38bc39667c1eaaf53 [diff] |
Merge "Add timeout support to android::base::WaitForProperty." am: ff692a5ace am: 6bbdfa3260 Change-Id: I72b4839593fe67be88ba5ff5dd95822af8f8d819