Merge Coral/Flame into AOSP master

Bug: 141248619
Change-Id: I68466b21b86708698c3813a35ba95beb83161f87
Merged-In: Ie8e878868c681902616859fb280b2bd232b294f1

apps/Fallback/res/values-in/strings.xml

@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="appTitle" msgid="161410001913116606">"Fallback"</string>
+    <string name="appTitle" msgid="161410001913116606">"Pengganti"</string>
     <string name="title" msgid="8156274565006125136">"Tindakan yang tidak didukung"</string>
     <string name="error" msgid="6539615832923362301">"Saat ini tindakan tersebut tidak didukung."</string>
 </resources>

samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java

@@ -339,19 +339,14 @@ public class ExternalStorage extends Activity {
          // Get path for the file on external storage.  If external
          // storage is not currently mounted this will fail.
          File file = new File(getExternalFilesDir(null), "DemoFile.jpg");
-         if (file != null) {
-             file.delete();
-         }
+         file.delete();
      }
 
      boolean hasExternalStoragePrivateFile() {
          // Get path for the file on external storage.  If external
          // storage is not currently mounted this will fail.
          File file = new File(getExternalFilesDir(null), "DemoFile.jpg");
-         if (file != null) {
-             return file.exists();
-         }
-         return false;
+         return file.exists();
      }
  // END_INCLUDE(private_file)
 

sdk/platform_source.prop_template

@@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
 Platform.Version=${PLATFORM_VERSION}
 Platform.CodeName=
-Pkg.Revision=2
+Pkg.Revision=3
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 Layoutlib.Api=15