From: Jorim Jaggi Date: Wed, 18 Jan 2017 18:21:46 +0000 (+0000) Subject: Merge "Revert "property_contexts: split into platform and non-platform components... X-Git-Tag: android-x86-8.1-r1~295^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=854925afe1e15360d33bbf55f8d22fc868929440;p=android-x86%2Fbionic.git Merge "Revert "property_contexts: split into platform and non-platform components"" am: dbfa1bd292 am: e6a17b4baf am: 07e74ea198 Change-Id: Ib9a5a94c95f24cbf36aa25ad297b48f3643a8fbe --- 854925afe1e15360d33bbf55f8d22fc868929440