tree c1c4da6bab6c209a4bc1cb386b2a2d2548e6d2a5
parent 6878cd20e64a14736e0099c90c6b896302f795d2
parent 80d2f01fbf53865fdf17b776f476a48fc8ae404a
author Elliott Hughes <enh@google.com> 1480528471 +0000
committer android-build-merger <android-build-merger@google.com> 1480528471 +0000

Merge "init: Fix sync issue on property trigger."
am: 80d2f01fbf

Change-Id: Iae57b79abeb7a372c0e483316d328d5307c66b73