| commit | 83e2d41cad2d525be1b76a306482916665a82efb | [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 | aaa49f2c02273a8cd38be3f7d03a61876571167d [diff] | |
| parent | 6f4e2cf604c8dd63f8ec5f68092742a8ab6e3c20 [diff] |
Merge "Add timeout support to android::base::WaitForProperty." am: ff692a5ace am: 6bbdfa3260 am: 6f4e2cf604 Change-Id: I159037a0fc54831494ce9f4e3dcf2b4237afd9d3