tree 959128a42294f02bdc738408367ea32c31c23cdb
parent b413703a3b3cf368e01cd5654ff0352b8b8c2fd5
parent dfd04923541de579e99ac8dacc678abb3a3e3f33
author Tom Cherry <tomcherry@google.com> 1497592886 +0000
committer android-build-merger <android-build-merger@google.com> 1497592886 +0000

Merge "Use WaitForProperty() to wait for restorecon" am: 963a205a1b am: 80ce34d6cb
am: dfd0492354

Change-Id: Id3b68e5b946fc1bf886f59e59fee3960a2899041