commit cdea707083804f3050d5a6b0f18371e47e9111d6
author Trevor Johns <trevorjohns@google.com> Thu May 28 19:03:31 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 28 19:03:31 2015 +0000
tree 12fd11f965955581fbea59b250b53e5c563521c9
parent 631adbcb6ac1e4ae947b05eceb46b351b5b015a2
parent f77f0eb5b77b58579b1f7e17f853b35e4181d0b3

am f77f0eb5: (-s ours) am 9d37fdb0: (-s ours) Add Camera2Raw to build.gradle (DO NOT MERGE)

* commit 'f77f0eb5b77b58579b1f7e17f853b35e4181d0b3':
  Add Camera2Raw to build.gradle (DO NOT MERGE)

build.gradle

diff --git a/build.gradle b/build.gradle
index 9ced21d..cdaf043 100644
--- a/build.gradle
+++ b/build.gradle
@@ -99,7 +99,6 @@
 "wearable/wear/XYZTouristAttractions",
 "connectivity/bluetooth/BluetoothAdvertisements",
 "wearable/wear/AlwaysOn",
-"media/Camera2Raw",
 ]
 
 List<String> taskNames = [

notification/CustomNotifications/template-params.xml

diff --git a/notification/CustomNotifications/template-params.xml b/notification/CustomNotifications/template-params.xml
index b18b927..0c6d951 100644
--- a/notification/CustomNotifications/template-params.xml
+++ b/notification/CustomNotifications/template-params.xml
@@ -20,7 +20,7 @@
     <package>com.example.android.customnotifications</package>
 
     <!-- change minSdk if needed-->
-    <minSdk>4</minSdk>
+    <minSdk>16</minSdk>
 
     <strings>
         <intro>