tree f924e0121ebe1ff2127a442418e3e0ace0bf323c
parent 9a64a4e3650710f66bab0504086052df600e373a
parent bd40570e257a05b6c197241a52ff1194ffde0ff7
author Tom Cherry <tomcherry@google.com> 1497593113 +0000
committer android-build-merger <android-build-merger@google.com> 1497593113 +0000

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

Change-Id: I8cf81bab9521b3d0a589943a0a5dbd815aa75b5c