commit cf8d9876dbe06089b7e99b56542b4f42b4247a9b
author The Android Automerger <android-build@google.com> Tue Sep 01 01:02:18 2015 -0700
committer The Android Automerger <android-build@google.com> Tue Sep 01 01:02:18 2015 -0700
tree 58896b01fd24b83334ef586bb80c073b4481aecc
parent 049d382f23bae257d8cf2dd2303eb2c3a166b932
parent 40cf11073743ed7daf05566e11966a0f095435ee

merge in mnc-dr-release history after reset to mnc-dr-dev

system/RuntimePermissions/Application/src/main/AndroidManifest.xml

diff --git a/system/RuntimePermissions/Application/src/main/AndroidManifest.xml b/system/RuntimePermissions/Application/src/main/AndroidManifest.xml
index 050b051..0acbb93 100644
--- a/system/RuntimePermissions/Application/src/main/AndroidManifest.xml
+++ b/system/RuntimePermissions/Application/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat.Light" >
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name" >

system/RuntimePermissionsBasic/Application/src/main/AndroidManifest.xml

diff --git a/system/RuntimePermissionsBasic/Application/src/main/AndroidManifest.xml b/system/RuntimePermissionsBasic/Application/src/main/AndroidManifest.xml
index 1f7ea6a..bfae9b9 100644
--- a/system/RuntimePermissionsBasic/Application/src/main/AndroidManifest.xml
+++ b/system/RuntimePermissionsBasic/Application/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme">
+            android:theme="@style/Theme.AppCompat.Light">
         <activity
                 android:name=".MainActivity"
                 android:label="@string/app_name">