| commit | 68a91fb95b047e1c9bef5cb276ebd4aeed965e2f | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Tue Mar 28 20:48:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 28 20:48:52 2017 +0000 |
| tree | 2b359ba41c0c7d6a29ae449e735a73fd8d1d8057 | |
| parent | a31d895910b128e72f0229a51b79cb7367b8fcff [diff] | |
| parent | f30abecf3cf6704e3deb0ceb1c7b32ad75d60eb2 [diff] |
Merge "Fix timeouts for android::base::WaitForProperty*" am: 57d78354d6 am: f30abecf3c Change-Id: I7037dfe31f5ffb433e798c12efb65fcc1fcb9dd8