From 70d78bbeecc491ebb0a30ee650d2445145992514 Mon Sep 17 00:00:00 2001
From: Will Haldean Brown <haldean@google.com>
Date: Thu, 20 Mar 2014 16:31:48 -0700
Subject: [PATCH] Make windowSwipeToDismiss a public attribute.

resolved conflicts for merge of e3d4f6c1 to master

Bug: 13348970
Change-Id: I695139376fc7f38b3438ab38659ca15490ce8f7c
---
 core/res/res/values/public.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 404b8527bb73..9493246997d5 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2093,6 +2093,7 @@
   <eat-comment />
 
   <public type="attr" name="banner" id="0x10103f2" />
+  <public type="attr" name="windowSwipeToDismiss" id="0x10103f3" />
 
 <!-- ===============================================================
      Resources added in version 21 of the platform
-- 
2.11.0