From d84d9f861140299e88fe0168652728733d6f96b9 Mon Sep 17 00:00:00 2001 From: Nick Kralevich <nnk@google.com> Date: Fri, 25 Jul 2014 15:30:19 -0700 Subject: [PATCH] resync with AOSP master Merge conflict resolution patch 11a29f295dd3c419462c3c09c6ea740289c9ffa6 inadvertently dropped a comment line. Pick it back up. Change-Id: I0f7a7cdbdacafb86610595ee616e84a06da50a17 --- te_macros | 1 + 1 file changed, 1 insertion(+) diff --git a/te_macros b/te_macros index f18cd36d5..e211a1794 100644 --- a/te_macros +++ b/te_macros @@ -368,6 +368,7 @@ define(`service_manager_local_audit_domain', ` typeattribute $1 service_manager_local_audit; ') +########################################### # use_drmservice(domain) # Ability to use DrmService which requires # DrmService to call getpidcon. -- GitLab