am ac1d40cf: Merge "Fixed inconsistent minSdkVersion and target= in NDK samples"

* commit 'ac1d40cf4fae70533a18205e4a6736b198aa8251':
  Fixed inconsistent minSdkVersion and target= in NDK samples

ndk/platforms/android-8/samples/bitmap-plasma/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-9
+target=android-8

ndk/platforms/android-9/samples/native-activity/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-7
+target=android-9

ndk/platforms/android-9/samples/native-plasma/AndroidManifest.xml

@@ -3,7 +3,7 @@
       package="com.example.native_plasma"
       android:versionCode="1"
       android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="9" />
     <application android:label="@string/app_name"
                  android:hasCode="false" android:debuggable="true">
         <activity android:name="android.app.NativeActivity"

ndk/platforms/android-9/samples/native-plasma/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-7
+target=android-9

ndk/platforms/android-9/samples/native-plasma/src/Dummy.java

@@ -1,4 +0,0 @@
-// Temporary until the NDK build system can deal with there being no Java source.
-class Dummy {
-
-}

ndk/samples/hello-jni/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-3

ndk/samples/hello-neon/AndroidManifest.xml

@@ -3,6 +3,7 @@
       package="com.example.neon"
       android:versionCode="1"
       android:versionName="1.0">
+    <uses-sdk android:minSdkVersion="4" />
     <application android:label="@string/app_name">
         <activity android:name=".HelloNeon"
                   android:label="@string/app_name">

ndk/samples/hello-neon/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-3
+target=android-4