commit bd39081ea3be644beccc2c8bbce3422c869f3a88
author Nick Kralevich <nnk@google.com> Fri Aug 03 17:34:04 2018 -0700
committer Nick Kralevich <nnk@google.com> Fri Aug 03 17:37:32 2018 -0700
tree 6f26a645cbfe900a712ed408be24b22bf2ab8583
parent 19e85dfb68a5d70ec25b072bf2b94fb4371307d7
parent 601b4422ae9e4c742eacf84d6bdec5014a6f3290

resolve merge conflicts of 601b4422ae9e4c742eacf84d6bdec5014a6f3290 to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic6dd370d6549c9dd1eb1e690c1c2f2fa441624b9

private/seapp_contexts

diff --git a/private/seapp_contexts b/private/seapp_contexts
index c21d49f..418150e 100644
--- a/private/seapp_contexts
+++ b/private/seapp_contexts
@@ -112,7 +112,7 @@
 user=_app seinfo=media domain=mediaprovider name=android.process.media type=app_data_file levelFrom=user
 user=_app seinfo=platform domain=platform_app type=app_data_file levelFrom=user
 user=_app isV2App=true isEphemeralApp=true domain=ephemeral_app type=app_data_file levelFrom=all
-user=_app isPrivApp=true domain=priv_app type=app_data_file levelFrom=user
+user=_app isPrivApp=true domain=priv_app type=privapp_data_file levelFrom=user
 user=_app minTargetSdkVersion=28 domain=untrusted_app type=app_data_file levelFrom=all
 user=_app minTargetSdkVersion=26 domain=untrusted_app_27 type=app_data_file levelFrom=user
 user=_app domain=untrusted_app_25 type=app_data_file levelFrom=user