From 3360b573d5908afc8eab6c59af99768288775f41 Mon Sep 17 00:00:00 2001
From: Jared Finder <jfinder@google.com>
Date: Wed, 16 Sep 2015 12:45:50 -0700
Subject: [PATCH] Merge regression fix.

---
 UnityExamples/ProjectSettings/ProjectSettings.asset | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/UnityExamples/ProjectSettings/ProjectSettings.asset b/UnityExamples/ProjectSettings/ProjectSettings.asset
index b07c09f2..444914a0 100644
--- a/UnityExamples/ProjectSettings/ProjectSettings.asset
+++ b/UnityExamples/ProjectSettings/ProjectSettings.asset
@@ -151,7 +151,10 @@ PlayerSettings:
       m_Size: 48
     - m_Icon: {fileID: 2800000, guid: 87944d11c2cdb43679e685502eff846c, type: 3}
       m_Size: 36
-  m_BuildTargetBatching: []
+  m_BuildTargetBatching:
+  - m_BuildTarget: Android
+    m_StaticBatching: 1
+    m_DynamicBatching: 0
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: AndroidPlayer
     m_APIs: 08000000