tree 139d6bad7cc342728aadcb9c5bacbde4f35c50ea
parent a119bcc8f631ce5290c1741766561fe73d3ca040
parent 6bbdfa326005a084f79d1d53a4920dc2c0506fa1
author Elliott Hughes <enh@google.com> 1487728197 +0000
committer android-build-merger <android-build-merger@google.com> 1487728197 +0000

Merge "Add timeout support to android::base::WaitForProperty." am: ff692a5ace
am: 6bbdfa3260

Change-Id: I72b4839593fe67be88ba5ff5dd95822af8f8d819