From 0f3a98f5c93581cc511684b92e11e2ed2a17581e Mon Sep 17 00:00:00 2001 From: Tim Kilbourn Date: Mon, 5 May 2014 16:54:30 -0700 Subject: [PATCH] DO NOT MERGE Hide isGame manifest attribute. Bug: 14116162 Change-Id: I72a0210124f22009914a860097e286c5ea9af345 --- core/res/res/values/attrs_manifest.xml | 3 ++- core/res/res/values/public.xml | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index bb4d3b6885737..879a42a93a35c 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -312,7 +312,7 @@ content providers. --> - @@ -980,6 +980,7 @@ any accounts. The type should correspond to the account authenticator type, such as "com.google". --> + diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 97fd76bc6ce40..67b43326190f3 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2094,6 +2094,5 @@ -