From: Jorim Jaggi <jjaggi@google.com>
Date: Wed, 18 Jan 2017 16:53:16 +0000 (+0000)
Subject: Merge "Revert "property_contexts: split into platform and non-platform components... 
X-Git-Tag: android-x86-8.1-r1~295^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=07e74ea198;p=android-x86%2Fbionic.git

Merge "Revert "property_contexts: split into platform and non-platform components"" am: dbfa1bd292
am: e6a17b4baf

Change-Id: I3124b8b82cf42f116322082d53462863a97cca09
---

07e74ea1983da67d78804814d2a897ab55a870f8