| commit | 411876614d539b15df227711eaf2d9fe47352ada | [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 | 9692e5160844a0f71f439d891c5ffa00b55917fc [diff] | |
| parent | 3b266e5857f699c28798b1bdc2e9798eb60ec9e4 [diff] |
Merge "Fix timeouts for android::base::WaitForProperty*" am: 57d78354d6 am: f30abecf3c Change-Id: I7037dfe31f5ffb433e798c12efb65fcc1fcb9dd8