tree 14472e98c23c20ecfd00a6f5dc63958d6e318240
parent be281d0b566d1a4e768505a43699db4f44543838
parent 432cca5c32a87f5c43df1b908eb606619a0e5635
author Tom Cherry <tomcherry@google.com> 1513635078 +0000
committer android-build-merger <android-build-merger@google.com> 1513635078 +0000

Merge "Reland "Have property_service create a serialized property_contexts file""
am: 432cca5c32

Change-Id: I6853876fd18d769f14c12be688457a58b8711bfd