diff -urN Android_6.0.1_r11/packages/apps/a1/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/a1/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/a1/AndroidManifest.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/AndroidManifest.xml 2017-03-26 17:39:10.208346000 +0900
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/a1/Android.mk SAMD_6.0.1_r11_20170930/packages/apps/a1/Android.mk
--- Android_6.0.1_r11/packages/apps/a1/Android.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/Android.mk 2015-11-26 02:27:50.000000000 +0900
@@ -0,0 +1,18 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := a1
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+
+include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under, $(LOCAL_PATH))
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/a1/Android.mk~ SAMD_6.0.1_r11_20170930/packages/apps/a1/Android.mk~
--- Android_6.0.1_r11/packages/apps/a1/Android.mk~ 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/Android.mk~ 2015-01-09 09:26:12.000000000 +0900
@@ -0,0 +1,18 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := TestApp
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+
+include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under, $(LOCAL_PATH))
+
+
+
+
Binary files Android_6.0.1_r11/packages/apps/a1/bin/a1.apk and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/a1.apk differ
diff -urN Android_6.0.1_r11/packages/apps/a1/bin/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/a1/bin/AndroidManifest.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/AndroidManifest.xml 2015-11-26 02:26:36.000000000 +0900
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/a1/BuildConfig.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/a1/BuildConfig.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/a1/R$attr.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/a1/R$attr.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/a1/R.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/a1/R.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/a1/R$dimen.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/a1/R$dimen.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/a1/R$drawable.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/a1/R$drawable.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/a1/R$id.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/a1/R$id.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/a1/R$layout.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/a1/R$layout.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/a1/R$menu.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/a1/R$menu.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/a1/R$string.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/a1/R$string.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/a1/R$style.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/a1/R$style.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/aa/MainActivity.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/aa/MainActivity.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes/com/example/aa/StartMyServiceAtBootReceiver.class and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes/com/example/aa/StartMyServiceAtBootReceiver.class differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/classes.dex and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/classes.dex differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/dexedLibs/android-support-v4-662f517e02939eb28de50a62c54df090.jar and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/dexedLibs/android-support-v4-662f517e02939eb28de50a62c54df090.jar differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/dexedLibs/android-support-v4-664e038797163c322951976646a5b761.jar and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/dexedLibs/android-support-v4-664e038797163c322951976646a5b761.jar differ
diff -urN Android_6.0.1_r11/packages/apps/a1/bin/jarlist.cache SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/jarlist.cache
--- Android_6.0.1_r11/packages/apps/a1/bin/jarlist.cache 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/jarlist.cache 2015-11-25 23:28:46.000000000 +0900
@@ -0,0 +1,3 @@
+# cache for current jar dependency. DO NOT EDIT.
+# format is
+# Encoding is UTF-8
Binary files Android_6.0.1_r11/packages/apps/a1/bin/res/crunch/drawable-hdpi/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/res/crunch/drawable-hdpi/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/res/crunch/drawable-mdpi/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/res/crunch/drawable-mdpi/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/res/crunch/drawable-xhdpi/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/res/crunch/drawable-xhdpi/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/res/crunch/drawable-xxhdpi/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/res/crunch/drawable-xxhdpi/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/a1/bin/resources.ap_ and SAMD_6.0.1_r11_20170930/packages/apps/a1/bin/resources.ap_ differ
diff -urN Android_6.0.1_r11/packages/apps/a1/.classpath SAMD_6.0.1_r11_20170930/packages/apps/a1/.classpath
--- Android_6.0.1_r11/packages/apps/a1/.classpath 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/.classpath 2015-05-12 21:44:40.000000000 +0900
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/a1/gen/com/example/a1/BuildConfig.java SAMD_6.0.1_r11_20170930/packages/apps/a1/gen/com/example/a1/BuildConfig.java
--- Android_6.0.1_r11/packages/apps/a1/gen/com/example/a1/BuildConfig.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/gen/com/example/a1/BuildConfig.java 2017-01-29 02:51:12.549813000 +0900
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package com.example.a1;
+
+public final class BuildConfig {
+ public final static boolean DEBUG = true;
+}
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/a1/gen/com/example/a1/R.java SAMD_6.0.1_r11_20170930/packages/apps/a1/gen/com/example/a1/R.java
--- Android_6.0.1_r11/packages/apps/a1/gen/com/example/a1/R.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/gen/com/example/a1/R.java 2017-01-29 02:51:12.549813000 +0900
@@ -0,0 +1,71 @@
+/* AUTO-GENERATED FILE. DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found. It
+ * should not be modified by hand.
+ */
+
+package com.example.a1;
+
+public final class R {
+ public static final class attr {
+ }
+ public static final class dimen {
+ /** Default screen margins, per the Android Design guidelines.
+
+ Example customization of dimensions originally defined in res/values/dimens.xml
+ (such as screen margins) for screens with more than 820dp of available width. This
+ would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
+
+ */
+ public static final int activity_horizontal_margin=0x7f040000;
+ public static final int activity_vertical_margin=0x7f040001;
+ }
+ public static final class drawable {
+ public static final int ic_launcher=0x7f020000;
+ }
+ public static final class id {
+ public static final int action_settings=0x7f080002;
+ public static final int button1=0x7f080001;
+ public static final int textView1=0x7f080000;
+ }
+ public static final class layout {
+ public static final int activity_main=0x7f030000;
+ }
+ public static final class menu {
+ public static final int main=0x7f070000;
+ }
+ public static final class string {
+ public static final int action_settings=0x7f050002;
+ public static final int app_name=0x7f050000;
+ public static final int hello_world=0x7f050001;
+ }
+ public static final class style {
+ /**
+ Base application theme, dependent on API level. This theme is replaced
+ by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+
+
+ Theme customizations available in newer API levels can go in
+ res/values-vXX/styles.xml, while customizations related to
+ backward-compatibility can go here.
+
+
+ Base application theme for API 11+. This theme completely replaces
+ AppBaseTheme from res/values/styles.xml on API 11+ devices.
+
+ API 11 theme customizations can go here.
+
+ Base application theme for API 14+. This theme completely replaces
+ AppBaseTheme from BOTH res/values/styles.xml and
+ res/values-v11/styles.xml on API 14+ devices.
+
+ API 14 theme customizations can go here.
+ */
+ public static final int AppBaseTheme=0x7f060000;
+ /** Application theme.
+ All customizations that are NOT specific to a particular API-level can go here.
+ */
+ public static final int AppTheme=0x7f060001;
+ }
+}
Binary files Android_6.0.1_r11/packages/apps/a1/ic_launcher-web.png and SAMD_6.0.1_r11_20170930/packages/apps/a1/ic_launcher-web.png differ
Binary files Android_6.0.1_r11/packages/apps/a1/libs/android-support-v4.jar and SAMD_6.0.1_r11_20170930/packages/apps/a1/libs/android-support-v4.jar differ
diff -urN Android_6.0.1_r11/packages/apps/a1/proguard-project.txt SAMD_6.0.1_r11_20170930/packages/apps/a1/proguard-project.txt
--- Android_6.0.1_r11/packages/apps/a1/proguard-project.txt 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/proguard-project.txt 2015-05-12 21:44:38.000000000 +0900
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff -urN Android_6.0.1_r11/packages/apps/a1/.project SAMD_6.0.1_r11_20170930/packages/apps/a1/.project
--- Android_6.0.1_r11/packages/apps/a1/.project 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/.project 2015-05-12 21:44:38.000000000 +0900
@@ -0,0 +1,33 @@
+
+
+ a1
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+
+
diff -urN Android_6.0.1_r11/packages/apps/a1/project.properties SAMD_6.0.1_r11_20170930/packages/apps/a1/project.properties
--- Android_6.0.1_r11/packages/apps/a1/project.properties 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/project.properties 2015-05-12 21:44:40.000000000 +0900
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-19
Binary files Android_6.0.1_r11/packages/apps/a1/res/drawable-hdpi/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/a1/res/drawable-hdpi/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/a1/res/drawable-mdpi/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/a1/res/drawable-mdpi/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/a1/res/drawable-xhdpi/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/a1/res/drawable-xhdpi/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/a1/res/drawable-xxhdpi/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/a1/res/drawable-xxhdpi/ic_launcher.png differ
diff -urN Android_6.0.1_r11/packages/apps/a1/res/layout/activity_main.xml SAMD_6.0.1_r11_20170930/packages/apps/a1/res/layout/activity_main.xml
--- Android_6.0.1_r11/packages/apps/a1/res/layout/activity_main.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/res/layout/activity_main.xml 2015-11-26 03:04:22.000000000 +0900
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/a1/res/layout/activity_main.xml~ SAMD_6.0.1_r11_20170930/packages/apps/a1/res/layout/activity_main.xml~
--- Android_6.0.1_r11/packages/apps/a1/res/layout/activity_main.xml~ 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/res/layout/activity_main.xml~ 2015-05-13 01:37:16.000000000 +0900
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/a1/res/menu/main.xml SAMD_6.0.1_r11_20170930/packages/apps/a1/res/menu/main.xml
--- Android_6.0.1_r11/packages/apps/a1/res/menu/main.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/res/menu/main.xml 2015-05-12 21:44:40.000000000 +0900
@@ -0,0 +1,11 @@
+
diff -urN Android_6.0.1_r11/packages/apps/a1/res/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/a1/res/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values/dimens.xml 2015-05-12 21:44:40.000000000 +0900
@@ -0,0 +1,7 @@
+
+
+
+ 16dp
+ 16dp
+
+
diff -urN Android_6.0.1_r11/packages/apps/a1/res/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values/strings.xml
--- Android_6.0.1_r11/packages/apps/a1/res/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values/strings.xml 2015-05-12 21:44:40.000000000 +0900
@@ -0,0 +1,8 @@
+
+
+
+ a1
+ Hello world!
+ Settings
+
+
diff -urN Android_6.0.1_r11/packages/apps/a1/res/values/styles.xml SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values/styles.xml
--- Android_6.0.1_r11/packages/apps/a1/res/values/styles.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values/styles.xml 2015-05-12 21:44:40.000000000 +0900
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/a1/res/values-v11/styles.xml SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values-v11/styles.xml
--- Android_6.0.1_r11/packages/apps/a1/res/values-v11/styles.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values-v11/styles.xml 2015-05-12 21:44:40.000000000 +0900
@@ -0,0 +1,11 @@
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/a1/res/values-v14/styles.xml SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values-v14/styles.xml
--- Android_6.0.1_r11/packages/apps/a1/res/values-v14/styles.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values-v14/styles.xml 2015-05-12 21:44:40.000000000 +0900
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/a1/res/values-w820dp/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values-w820dp/dimens.xml
--- Android_6.0.1_r11/packages/apps/a1/res/values-w820dp/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/res/values-w820dp/dimens.xml 2015-05-12 21:44:40.000000000 +0900
@@ -0,0 +1,10 @@
+
+
+
+ 64dp
+
+
diff -urN Android_6.0.1_r11/packages/apps/a1/src/com/example/aa/MainActivity.java SAMD_6.0.1_r11_20170930/packages/apps/a1/src/com/example/aa/MainActivity.java
--- Android_6.0.1_r11/packages/apps/a1/src/com/example/aa/MainActivity.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/src/com/example/aa/MainActivity.java 2017-01-29 02:51:12.549813000 +0900
@@ -0,0 +1,40 @@
+package com.example.aa;
+
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.List;
+
+import com.example.a1.R;
+
+import android.app.Activity;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.media.MediaCodec;
+import android.media.MediaExtractor;
+import android.media.MediaFormat;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.IBinder;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+public class MainActivity extends Service {
+ private final String TAG = "TAG";
+
+ @Override
+ public IBinder onBind(Intent arg0) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+}
diff -urN Android_6.0.1_r11/packages/apps/a1/src/com/example/aa/StartMyServiceAtBootReceiver.java SAMD_6.0.1_r11_20170930/packages/apps/a1/src/com/example/aa/StartMyServiceAtBootReceiver.java
--- Android_6.0.1_r11/packages/apps/a1/src/com/example/aa/StartMyServiceAtBootReceiver.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/src/com/example/aa/StartMyServiceAtBootReceiver.java 2017-09-22 00:56:54.697709000 +0900
@@ -0,0 +1,55 @@
+package com.example.aa;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+
+import java.util.List;
+
+public class StartMyServiceAtBootReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+ //saveWpaConfig(context, "coffeesmith5G", "coffeesmith7", false);
+ //saveWpaConfig(context, "dcslab5G", "dcslab2014", false);
+ saveWpaConfig(context, "U+Net3453", "4000010180", false);
+ //saveWpaConfig(context, "dcslab", "dcslab11", false);
+ //saveWpaConfig(context, "olleh_GiGA_WiFi_C62C", "0000008420", false);
+ //saveWpaConfig(context, "Sbj", "/qudwns8388", false);
+ //saveWpaConfig(context, "tomntoms", "t07044114138", false);
+ //saveWpaConfig(context, "HOLLYS", "hollys12", false);
+ }
+ }
+
+ public static void saveWpaConfig(Context context, String SSID, String Passphrase, boolean Hidden)
+ {
+ WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+ if (!wifiManager.isWifiEnabled())
+ wifiManager.setWifiEnabled(true);
+
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ // setup a wifi configuration
+ WifiConfiguration wc = new WifiConfiguration();
+ wc.SSID = "\""+SSID+"\"";
+ wc.preSharedKey = "\""+Passphrase+"\"";
+ wc.status = WifiConfiguration.Status.ENABLED;
+ wc.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.TKIP);
+ wc.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
+ wc.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
+ wc.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.TKIP);
+ wc.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
+ wc.allowedProtocols.set(WifiConfiguration.Protocol.RSN);
+ // connect to and enable the connection
+ int netId = wifiManager.addNetwork(wc);
+ wifiManager.enableNetwork(netId, true);
+ wifiManager.setWifiEnabled(true);
+ }
+}
diff -urN Android_6.0.1_r11/packages/apps/a1/src/com/example/aa/StartMyServiceAtBootReceiver.java~ SAMD_6.0.1_r11_20170930/packages/apps/a1/src/com/example/aa/StartMyServiceAtBootReceiver.java~
--- Android_6.0.1_r11/packages/apps/a1/src/com/example/aa/StartMyServiceAtBootReceiver.java~ 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/a1/src/com/example/aa/StartMyServiceAtBootReceiver.java~ 2015-11-28 00:23:54.000000000 +0900
@@ -0,0 +1,54 @@
+package com.example.aa;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+
+import java.util.List;
+
+public class StartMyServiceAtBootReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+ try {
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ saveWpaConfig(context, "dcslab5G", "dcslab2014", false);
+ }
+ }
+
+ public static void saveWpaConfig(Context context, String SSID, String Passphrase, boolean Hidden)
+ {
+ WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+ if (!wifiManager.isWifiEnabled())
+ wifiManager.setWifiEnabled(true);
+
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ // setup a wifi configuration
+ WifiConfiguration wc = new WifiConfiguration();
+ wc.SSID = "\""+SSID+"\"";
+ wc.preSharedKey = "\""+Passphrase+"\"";
+ wc.status = WifiConfiguration.Status.ENABLED;
+ wc.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.TKIP);
+ wc.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
+ wc.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
+ wc.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.TKIP);
+ wc.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
+ wc.allowedProtocols.set(WifiConfiguration.Protocol.RSN);
+ // connect to and enable the connection
+ int netId = wifiManager.addNetwork(wc);
+ wifiManager.enableNetwork(netId, true);
+ wifiManager.setWifiEnabled(true);
+ }
+}
Binary files Android_6.0.1_r11/packages/apps/BasicSmsReceiver/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/BasicSmsReceiver/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Bluetooth/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Bluetooth/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Browser/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Browser/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Calculator/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Calculator/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Calendar/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Calendar/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Camera/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Camera/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Camera2/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Camera2/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/CarrierConfig/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/CarrierConfig/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/CellBroadcastReceiver/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/CellBroadcastReceiver/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/CertInstaller/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/CertInstaller/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Contacts/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Contacts/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/ContactsCommon/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/ContactsCommon/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/DeskClock/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/DeskClock/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Dialer/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Dialer/.git/index differ
diff -urN Android_6.0.1_r11/packages/apps/Dummy1/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/Dummy1/AndroidManifest.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/AndroidManifest.xml 2017-08-29 23:24:30.000000000 +0900
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/Dummy1/Android.mk SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/Android.mk
--- Android_6.0.1_r11/packages/apps/Dummy1/Android.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/Android.mk 2017-03-16 13:15:32.000000000 +0900
@@ -0,0 +1,12 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := Dummy1
+
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_PACKAGE)
diff -urN Android_6.0.1_r11/packages/apps/Dummy1/CleanSpec.mk SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/CleanSpec.mk
--- Android_6.0.1_r11/packages/apps/Dummy1/CleanSpec.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/CleanSpec.mk 2016-11-01 17:36:40.000000000 +0900
@@ -0,0 +1,49 @@
+# Copyright (C) 2007 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
Binary files Android_6.0.1_r11/packages/apps/Dummy1/res/drawable/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/res/drawable/ic_launcher.png differ
diff -urN Android_6.0.1_r11/packages/apps/Dummy1/res/layout/activity_main.xml SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/res/layout/activity_main.xml
--- Android_6.0.1_r11/packages/apps/Dummy1/res/layout/activity_main.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/res/layout/activity_main.xml 2017-08-05 13:18:44.000000000 +0900
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/Dummy1/res/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/res/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/Dummy1/res/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/res/values/dimens.xml 2016-11-01 17:36:40.000000000 +0900
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff -urN Android_6.0.1_r11/packages/apps/Dummy1/res/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/res/values/strings.xml
--- Android_6.0.1_r11/packages/apps/Dummy1/res/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/res/values/strings.xml 2016-11-01 17:36:40.000000000 +0900
@@ -0,0 +1,25 @@
+
+
+
+
+
+ Dummy1
+
+ Speech Recorder
+ Record
+ Redo
+
+
diff -urN Android_6.0.1_r11/packages/apps/Dummy1/src/com/collaboroid/dummy1/MainActivity.java SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/src/com/collaboroid/dummy1/MainActivity.java
--- Android_6.0.1_r11/packages/apps/Dummy1/src/com/collaboroid/dummy1/MainActivity.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy1/src/com/collaboroid/dummy1/MainActivity.java 2017-08-05 14:01:04.000000000 +0900
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.collaboroid.dummy1;
+
+import android.app.Activity;
+import android.content.res.ABCManager;
+import android.content.res.AssetManager;
+import android.graphics.drawable.Drawable;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.os.Bundle;
+
+import android.content.Context;
+import android.service.remote.RemoteServiceManager;
+
+import java.io.InputStream;
+
+
+public class MainActivity extends Activity {
+ private static final String TAG = "Dummy1";
+
+ @Override
+ protected void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ //setContentView(R.layout.activity_main);
+ setContentView2("res/layout/activity_main.xml");
+ TextView tv1 = (TextView)findViewById("textView1");
+ //tv1.setText("AAAAAA");
+
+ TextView tv2 = (TextView)findViewById("textView2");
+ //tv2.setText("BBBBBB");
+
+ TextView tv3 = (TextView)findViewById("textView3");
+ //tv3.setText("CCCCCC");
+
+
+
+ ImageView ivCard1 = (ImageView)findViewById("imageView_a");
+ Log.d("samd profiling", "ivCard1 Show start");
+ try{
+ AssetManager am = getApplicationContext().getAssets();
+ InputStream ims = am.open("a1.png");
+ Drawable d = Drawable.createFromStream(ims, null);
+ ivCard1.setImageDrawable(d);
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+
+ Log.d(TAG, "FIRST DUMMY!");
+ }
+}
diff -urN Android_6.0.1_r11/packages/apps/Dummy2/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/Dummy2/AndroidManifest.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/AndroidManifest.xml 2017-08-29 23:24:30.000000000 +0900
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/Dummy2/Android.mk SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/Android.mk
--- Android_6.0.1_r11/packages/apps/Dummy2/Android.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/Android.mk 2016-11-15 11:25:03.000000000 +0900
@@ -0,0 +1,12 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := Dummy2
+
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_PACKAGE)
diff -urN Android_6.0.1_r11/packages/apps/Dummy2/CleanSpec.mk SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/CleanSpec.mk
--- Android_6.0.1_r11/packages/apps/Dummy2/CleanSpec.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/CleanSpec.mk 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,49 @@
+# Copyright (C) 2007 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
Binary files Android_6.0.1_r11/packages/apps/Dummy2/res/drawable/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/res/drawable/ic_launcher.png differ
diff -urN Android_6.0.1_r11/packages/apps/Dummy2/res/layout/activity_main.xml SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/res/layout/activity_main.xml
--- Android_6.0.1_r11/packages/apps/Dummy2/res/layout/activity_main.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/res/layout/activity_main.xml 2017-08-05 13:18:44.000000000 +0900
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/Dummy2/res/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/res/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/Dummy2/res/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/res/values/dimens.xml 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff -urN Android_6.0.1_r11/packages/apps/Dummy2/res/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/res/values/strings.xml
--- Android_6.0.1_r11/packages/apps/Dummy2/res/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/res/values/strings.xml 2017-01-24 23:25:30.000000000 +0900
@@ -0,0 +1,29 @@
+
+
+
+
+
+ ABCDEEE
+ TexasHoldem
+ A
+ B
+ C
+
+ Speech Recorder
+ Record
+ Redo
+ Request Send
+
diff -urN Android_6.0.1_r11/packages/apps/Dummy2/src/com/collaboroid/dummy2/MainActivity.java SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/src/com/collaboroid/dummy2/MainActivity.java
--- Android_6.0.1_r11/packages/apps/Dummy2/src/com/collaboroid/dummy2/MainActivity.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Dummy2/src/com/collaboroid/dummy2/MainActivity.java 2017-08-05 14:00:13.000000000 +0900
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.collaboroid.dummy2;
+
+import android.app.Activity;
+import android.content.res.ABCManager;
+import android.content.res.AssetManager;
+import android.graphics.drawable.Drawable;
+import android.os.Process;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.os.Bundle;
+
+import java.io.InputStream;
+
+public class MainActivity extends Activity {
+ private static final String TAG = "Dummy2";
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ //setContentView(R.layout.activity_main);
+ setContentView2("res/layout/activity_main.xml");
+
+ //TextView tv = (TextView)findViewById(R.id.textView);
+ TextView tv = (TextView)findViewById("textView");
+ //tv.setText("MainActivity");
+
+ ImageView ivCard1 = (ImageView)findViewById("imageView_a");
+ Log.d("samd profiling", "ivCard1 Show start");
+ /*try{
+ AssetManager am = getApplicationContext().getAssets();
+ InputStream ims = am.open("a1.png");
+ Drawable d = Drawable.createFromStream(ims, null);
+ ivCard1.setImageDrawable(d);
+ }catch(Exception e){
+ e.printStackTrace();
+ }*/
+
+ Button btn = (Button)findViewById("btn");
+ btn.setText("BUTTON");
+ btn.setOnClickListener(new Button.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ // TODO Auto-generated method stub
+ Toast.makeText(getApplicationContext(), "BBBBB!!!", Toast.LENGTH_LONG).show();
+ }
+ });
+
+
+ Log.d(TAG, "SECOND DUMMY!");
+ }
+}
Binary files Android_6.0.1_r11/packages/apps/Email/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Email/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/ExactCalculator/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/ExactCalculator/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Exchange/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Exchange/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/FMRadio/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/FMRadio/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Gallery/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Gallery/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Gallery2/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Gallery2/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/HTMLViewer/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/HTMLViewer/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/InCallUI/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/InCallUI/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/KeyChain/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/KeyChain/.git/index differ
diff -urN Android_6.0.1_r11/packages/apps/Launcher2/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/Launcher2/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/Launcher2/AndroidManifest.xml 2017-09-27 02:08:11.579735819 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Launcher2/AndroidManifest.xml 2017-09-21 11:21:53.352424000 +0900
@@ -66,7 +66,7 @@
android:label="@string/application_name"
android:icon="@mipmap/ic_launcher_home"
android:hardwareAccelerated="true"
- android:largeHeap="@bool/config_largeHeap"
+ android:largeHeap="true"
android:supportsRtl="true">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/Android.mk SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/Android.mk
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/Android.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/Android.mk 2017-08-29 02:03:55.000000000 +0900
@@ -0,0 +1,24 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files) \
+
+LOCAL_PACKAGE_NAME := MekoMosaicApp
+
+LOCAL_STATIC_JAVA_LIBRARIES := mekomosaic
+
+LOCAL_CERTIFICATE := platform
+
+LOCAL_PRIVILEGED_MODULE := true
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_PACKAGE)
+
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += mekomosaic:libs/MekoMosaicLibrary.jar
+
+include $(BUILD_MULTI_PREBUILT)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/AndroidManifest.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/AndroidManifest.xml 2017-03-17 02:08:16.000000000 +0900
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/local.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/local.jpg differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/split1_4_1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/split1_4_1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/split1_4_2.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/split1_4_2.jpg differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/split1_4_3.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/split1_4_3.jpg differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/split1_4_4.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/split1_4_4.jpg differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/split1_4_5.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/drawable/split1_4_5.jpg differ
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/layout/remotedevice.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/layout/remotedevice.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/layout/remotedevice.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/layout/remotedevice.xml 2017-08-27 14:22:14.000000000 +0900
@@ -0,0 +1,20 @@
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/values/dimens.xml 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/values/strings.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/assets/collaboroid/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/assets/collaboroid/values/strings.xml 2017-05-16 19:49:32.000000000 +0900
@@ -0,0 +1,30 @@
+
+
+
+
+
+ MosaicApp
+ MosaicApp
+ Send Distribute Bitmap
+ Background
+ Single Mosaic
+ Single Mosaic2
+ SelectImage
+ Local
+ Remote
+ ----------
+ solo test
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/build.properties SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/build.properties
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/build.properties 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/build.properties 2017-02-27 16:07:46.000000000 +0900
@@ -0,0 +1 @@
+external.libs.dir=lib
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/CleanSpec.mk SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/CleanSpec.mk
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/CleanSpec.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/CleanSpec.mk 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,49 @@
+# Copyright (C) 2007 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/libs/MekoMosaicLibrary.jar and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/libs/MekoMosaicLibrary.jar differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/drawable/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/drawable/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/drawable/local.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/drawable/local.jpg differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/drawable/split1_4_1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/drawable/split1_4_1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/drawable/split1_4_2.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/drawable/split1_4_2.jpg differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/drawable/split1_4_3.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/drawable/split1_4_3.jpg differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/drawable/split1_4_4.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/drawable/split1_4_4.jpg differ
Binary files Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/drawable/split1_4_5.jpg and SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/drawable/split1_4_5.jpg differ
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/activity_main.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/activity_main.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/activity_main.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/activity_main.xml 2017-08-27 03:59:30.000000000 +0900
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/localdevice.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/localdevice.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/localdevice.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/localdevice.xml 2017-08-28 00:52:24.000000000 +0900
@@ -0,0 +1,19 @@
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/menuactivity.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/menuactivity.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/menuactivity.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/menuactivity.xml 2017-09-22 03:29:02.913572000 +0900
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/merge_image.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/merge_image.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/merge_image.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/merge_image.xml 2017-08-27 01:47:10.000000000 +0900
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/remotedevice.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/remotedevice.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/remotedevice.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/remotedevice.xml 2017-06-16 09:52:11.000000000 +0900
@@ -0,0 +1,20 @@
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/solo_mosaic_test.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/solo_mosaic_test.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/solo_mosaic_test.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/solo_mosaic_test.xml 2017-05-22 10:36:42.000000000 +0900
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/split_image.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/split_image.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/layout/split_image.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/layout/split_image.xml 2017-08-27 01:44:43.000000000 +0900
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/values/dimens.xml 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/values/strings.xml
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/res/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/res/values/strings.xml 2017-08-29 02:04:33.000000000 +0900
@@ -0,0 +1,56 @@
+
+
+
+
+
+ MekoMosaicApp
+ MekoMosaicApp
+ LocalProcess
+ D 1:1
+ D 1:2
+ D 1:3
+ D 1:4
+ D 1:5
+ D 1:6
+ D 1:7
+ D 1:8
+ Background
+ Single Mosaic
+ Single Mosaic2
+ SelectImage
+ Local
+ Remote
+ ----------
+ split test
+ merge test
+ save bmp
+ split1:1
+ split1:2
+ split1:3
+ split1:4
+ split1:5
+ split1:6
+ split1:7
+ split1:8
+ merge1:1
+ merge1:2
+ merge1:3
+ merge1:4
+ merge1:5
+ merge1:6
+ merge1:7
+ merge1:8
+
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MainActivity.java SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MainActivity.java
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MainActivity.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MainActivity.java 2017-08-29 02:04:04.000000000 +0900
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mekomosaic.test;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.*;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+public class MainActivity extends Activity {
+ private static final String TAG = "TestApp";
+
+ Button btn_local_device, btn_remote_device, btn_test, btn_test2;
+ @Override
+ protected void onCreate(Bundle icicle) {
+
+ super.onCreate(icicle);
+ setContentView(R.layout.activity_main);
+ btn_local_device = (Button)findViewById(R.id.btn_local_device);
+ btn_local_device.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(MainActivity.this, MenuActivity.class);
+ startActivity(intent);
+ }
+ });
+ btn_remote_device = (Button) findViewById(R.id.btn_remote_device);
+ btn_remote_device.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(MainActivity.this, RemoteActivity.class);
+ startActivity(intent);
+ }
+ });
+
+ btn_test = (Button) findViewById(R.id.btn_test);
+ btn_test.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(MainActivity.this, SplitTest.class);
+ startActivity(intent);
+ }
+ });
+ btn_test2 = (Button) findViewById(R.id.btn_test2);
+ btn_test2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Intent intent = new Intent(MainActivity.this, MergeTest.class);
+ startActivity(intent);
+ }
+ });
+ }
+
+}
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MenuActivity.java SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MenuActivity.java
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MenuActivity.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MenuActivity.java 2017-09-22 04:29:50.287123000 +0900
@@ -0,0 +1,457 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mekomosaic.test;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import android.graphics.Color;
+import android.os.ServiceManager;
+import android.service.remote.IRemoteService;
+import android.service.samd.SAMDListener;
+import android.service.samd.SAMDManager;
+import android.service.samd.SAMDMessage;
+import android.util.Log;
+import android.view.View;
+import android.widget.*;
+import android.os.Bundle;
+
+
+import dcs.meko.mosaic.mekomosaic.MekoMosaic;
+
+public class MenuActivity extends Activity implements SAMDListener{
+ Button btn_local, btn_distribute1, btn_distribute2, btn_distribute3, btn_distribute4
+ ,btn_distribute5, btn_distribute6, btn_distribute7, btn_distribute8;
+ ImageView localimage , image1, image2, image3, image4;
+ SAMDManager manager;
+ @Override
+ protected void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ setContentView(R.layout.menuactivity);
+ localimage = (ImageView)findViewById(R.id.localimage2);
+ image1 = (ImageView)findViewById(R.id.localimage3);
+ image2 = (ImageView)findViewById(R.id.localimage4);
+ image3 = (ImageView)findViewById(R.id.localimage5);
+ image4 = (ImageView)findViewById(R.id.localimage6);
+
+ manager = new SAMDManager(getApplicationContext());
+ manager.registerSAMDListener(this);
+
+ btn_local = (Button) findViewById(R.id.btn_local);
+ btn_local.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "Mosaic Local Process Start");
+ distribute_mosaic_process(0);
+ }
+ });
+
+ btn_distribute1 = (Button)findViewById(R.id.btn_distribute1);
+ btn_distribute1.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "Mosaic D 1:1 Process Start");
+ distribute_mosaic_process(1);
+
+ }
+ });
+ btn_distribute2 = (Button)findViewById(R.id.btn_distribute2);
+ btn_distribute2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "Mosaic D 1:2 Process Start");
+ distribute_mosaic_process(2);
+ }
+ });
+ btn_distribute3 = (Button)findViewById(R.id.btn_distribute3);
+ btn_distribute3.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "Mosaic D 1:3 Process Start");
+ distribute_mosaic_process(3);
+
+ }
+ });
+ btn_distribute4 = (Button)findViewById(R.id.btn_distribute4);
+ btn_distribute4.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "Mosaic D 1:4 Process Start");
+ distribute_mosaic_process(4);
+
+ }
+ });
+ btn_distribute5 = (Button)findViewById(R.id.btn_distribute5);
+ btn_distribute5.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "Mosaic D 1:5 Process Start");
+ distribute_mosaic_process(5);
+
+ }
+ });
+ btn_distribute6 = (Button)findViewById(R.id.btn_distribute6);
+ btn_distribute6.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "Mosaic D 1:6 Process Start");
+ distribute_mosaic_process(6);
+ }
+ });
+ btn_distribute7 = (Button)findViewById(R.id.btn_distribute7);
+ btn_distribute7.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "Mosaic D 1:7 Process Start");
+ distribute_mosaic_process(7);
+
+ }
+ });
+ btn_distribute8 = (Button)findViewById(R.id.btn_distribute8);
+ btn_distribute8.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "Mosaic D 1:8 Process Start");
+ distribute_mosaic_process(8);
+
+ }
+ });
+
+ }
+ public void distribute_mosaic_process(int deviceNum){
+ try {
+ if (deviceNum == 0) {
+
+
+// Bitmap local_b = BitmapFactory.decodeFile("/data/collaboroid/preprocess/MosaicApp/assets/split1_2_1.jpg", options);
+
+// Bitmap local_b = BitmapFactory.decodeStream(getAssets().open("collaboroid/drawable/local.jpg"))
+// .copy(Bitmap.Config.ARGB_8888, true);
+
+ //localMosaicProcess("local.jpg");
+ //localMosaicProcess("split1_8_1.jpg");
+ } else if (deviceNum == 1) {
+
+// Bitmap local_b = BitmapFactory.decodeStream(getAssets().open("collaboroid/drawable/split1_1_1.jpg"))
+// .copy(Bitmap.Config.ARGB_8888, true);
+
+ //Device 0
+ Bundle b0 = new Bundle();
+ b0.putInt("resourceNum",1);
+ b0.putString("resource1","assets/split1_1_2.jpg");
+ manager.launchActivity(0,"RemoteActivity", b0);
+ //Local
+ //localMosaicProcess("split1_1_1.jpg");
+ } else if (deviceNum == 2) {
+
+// Bitmap local_b = BitmapFactory.decodeStream(getAssets().open("collaboroid/drawable/split1_2_1.jpg"))
+// .copy(Bitmap.Config.ARGB_8888, true);
+ //Device 0
+ Bundle b0 = new Bundle();
+ b0.putInt("resourceNum",1);
+ b0.putString("resource1","assets/split1_2_2.jpg");
+ manager.launchActivity(0,"RemoteActivity", b0);
+ //Device 1
+ Bundle b1 = new Bundle();
+ b1.putInt("resourceNum",1);
+ b1.putString("resource1","assets/split1_2_3.jpg");
+ manager.launchActivity(1,"RemoteActivity", b1);
+ //Local
+ //localMosaicProcess("split1_2_1.jpg");
+
+ } else if (deviceNum == 3) {
+
+// Bitmap local_b = BitmapFactory.decodeStream(getAssets().open("collaboroid/drawable/split1_3_1.jpg"))
+// .copy(Bitmap.Config.ARGB_8888, true);
+ //Device 0
+ Bundle b0 = new Bundle();
+ b0.putInt("resourceNum",1);
+ b0.putString("resource1","assets/split1_3_2.jpg");
+ manager.launchActivity(0,"RemoteActivity", b0);
+ //Device 1
+ Bundle b1 = new Bundle();
+ b1.putInt("resourceNum",1);
+ b1.putString("resource1","assets/split1_3_3.jpg");
+ manager.launchActivity(1,"RemoteActivity", b1);
+ //Device 2
+ Bundle b2 = new Bundle();
+ b2.putInt("resourceNum",1);
+ b2.putString("resource1","assets/split1_3_4.jpg");
+ manager.launchActivity(2,"RemoteActivity", b2);
+ //Local
+ //localMosaicProcess("split1_3_1.jpg");
+ } else if (deviceNum == 4) {
+
+ Bitmap local_b = BitmapFactory.decodeStream(getAssets().open("collaboroid/drawable/split1_4_1.jpg"))
+ .copy(Bitmap.Config.ARGB_8888, true);
+ //Device 0
+ Bundle b0 = new Bundle();
+ b0.putInt("resourceNum",1);
+ b0.putString("resource1","assets/split1_4_2.jpg");
+ manager.launchActivity(0,"RemoteActivity", b0);
+ //Device 1
+ Bundle b1 = new Bundle();
+ b1.putInt("resourceNum",1);
+ b1.putString("resource1","assets/split1_4_3.jpg");
+ manager.launchActivity(1,"RemoteActivity", b1);
+ //Device 2
+ Bundle b2 = new Bundle();
+ b2.putInt("resourceNum",1);
+ b2.putString("resource1","assets/split1_4_4.jpg");
+ manager.launchActivity(2,"RemoteActivity", b2);
+ //Device 3
+ Bundle b3 = new Bundle();
+ b3.putInt("resourceNum",1);
+ b3.putString("resource1","assets/split1_4_5.jpg");
+ manager.launchActivity(3,"RemoteActivity", b3);
+ //Local
+ localMosaicProcess(local_b);
+ } else if (deviceNum == 5) {
+
+// Bitmap local_b = BitmapFactory.decodeStream(getAssets().open("collaboroid/drawable/split1_5_1.jpg"))
+// .copy(Bitmap.Config.ARGB_8888, true);
+
+ //Device 0
+ Bundle b0 = new Bundle();
+ b0.putInt("resourceNum",1);
+ b0.putString("resource1","assets/split1_5_2.jpg");
+ manager.launchActivity(0,"RemoteActivity", b0);
+ //Device 1
+ Bundle b1 = new Bundle();
+ b1.putInt("resourceNum",1);
+ b1.putString("resource1","assets/split1_5_3.jpg");
+ manager.launchActivity(1,"RemoteActivity", b1);
+ //Device 2
+ Bundle b2 = new Bundle();
+ b2.putInt("resourceNum",1);
+ b2.putString("resource1","assets/split1_5_4.jpg");
+ manager.launchActivity(2,"RemoteActivity", b2);
+ //Device 3
+ Bundle b3 = new Bundle();
+ b3.putInt("resourceNum",1);
+ b3.putString("resource1","assets/split1_5_5.jpg");
+ manager.launchActivity(3,"RemoteActivity", b3);
+ //Device 4
+ Bundle b4 = new Bundle();
+ b4.putInt("resourceNum",1);
+ b4.putString("resource1","assets/split1_5_6.jpg");
+ manager.launchActivity(4,"RemoteActivity", b4);
+ //Local
+ //localMosaicProcess("split1_5_1.jpg");
+ } else if (deviceNum == 6) {
+
+// Bitmap local_b = BitmapFactory.decodeStream(getAssets().open("collaboroid/drawable/split1_6_1.jpg"))
+// .copy(Bitmap.Config.ARGB_8888, true);
+ //Device 0
+ Bundle b0 = new Bundle();
+ b0.putInt("resourceNum",1);
+ b0.putString("resource1","assets/split1_6_2.jpg");
+ manager.launchActivity(0,"RemoteActivity", b0);
+ //Device 1
+ Bundle b1 = new Bundle();
+ b1.putInt("resourceNum",1);
+ b1.putString("resource1","assets/split1_6_3.jpg");
+ manager.launchActivity(1,"RemoteActivity", b1);
+ //Device 2
+ Bundle b2 = new Bundle();
+ b2.putInt("resourceNum",1);
+ b2.putString("resource1","assets/split1_6_4.jpg");
+ manager.launchActivity(2,"RemoteActivity", b2);
+ //Device 3
+ Bundle b3 = new Bundle();
+ b3.putInt("resourceNum",1);
+ b3.putString("resource1","assets/split1_6_5.jpg");
+ manager.launchActivity(3,"RemoteActivity", b3);
+ //Device 4
+ Bundle b4 = new Bundle();
+ b4.putInt("resourceNum",1);
+ b4.putString("resource1","assets/split1_6_6.jpg");
+ manager.launchActivity(4,"RemoteActivity", b4);
+ //Device 5
+ Bundle b5 = new Bundle();
+ b5.putInt("resourceNum",1);
+ b5.putString("resource1","assets/split1_6_7.jpg");
+ manager.launchActivity(5,"RemoteActivity", b5);
+ //Local
+ //localMosaicProcess("split1_6_1.jpg");
+ } else if (deviceNum == 7) {
+
+// Bitmap local_b = BitmapFactory.decodeStream(getAssets().open("collaboroid/drawable/split1_7_1.jpg"))
+// .copy(Bitmap.Config.ARGB_8888, true);
+ //Device 0
+ Bundle b0 = new Bundle();
+ b0.putInt("resourceNum",1);
+ b0.putString("resource1","assets/split1_7_2.jpg");
+ manager.launchActivity(0,"RemoteActivity", b0);
+ //Device 1
+ Bundle b1 = new Bundle();
+ b1.putInt("resourceNum",1);
+ b1.putString("resource1","assets/split1_7_3.jpg");
+ manager.launchActivity(1,"RemoteActivity", b1);
+ //Device 2
+ Bundle b2 = new Bundle();
+ b2.putInt("resourceNum",1);
+ b2.putString("resource1","assets/split1_7_4.jpg");
+ manager.launchActivity(2,"RemoteActivity", b2);
+ //Device 3
+ Bundle b3 = new Bundle();
+ b3.putInt("resourceNum",1);
+ b3.putString("resource1","assets/split1_7_5.jpg");
+ manager.launchActivity(3,"RemoteActivity", b3);
+ //Device 4
+ Bundle b4 = new Bundle();
+ b4.putInt("resourceNum",1);
+ b4.putString("resource1","assets/split1_7_6.jpg");
+ manager.launchActivity(4,"RemoteActivity", b4);
+ //Device 5
+ Bundle b5 = new Bundle();
+ b5.putInt("resourceNum",1);
+ b5.putString("resource1","assets/split1_7_7.jpg");
+ manager.launchActivity(5,"RemoteActivity", b5);
+ //Device 6
+ Bundle b6 = new Bundle();
+ b6.putInt("resourceNum",1);
+ b6.putString("resource1","assets/split1_7_8.jpg");
+ manager.launchActivity(6,"RemoteActivity", b6);
+ //Local
+ //localMosaicProcess("split1_7_1.jpg");
+ } else if (deviceNum == 8) {
+
+// Bitmap local_b = BitmapFactory.decodeStream(getAssets().open("collaboroid/drawable/split1_8_1.jpg"))
+// .copy(Bitmap.Config.ARGB_8888, true);
+ //Device 0
+ Bundle b0 = new Bundle();
+ b0.putInt("resourceNum",1);
+ b0.putString("resource1","assets/split1_8_2.jpg");
+ manager.launchActivity(0,"RemoteActivity", b0);
+ //Device 1
+ Bundle b1 = new Bundle();
+ b1.putInt("resourceNum",1);
+ b1.putString("resource1","assets/split1_8_3.jpg");
+ manager.launchActivity(1,"RemoteActivity", b1);
+ //Device 2
+ Bundle b2 = new Bundle();
+ b2.putInt("resourceNum",1);
+ b2.putString("resource1","assets/split1_8_4.jpg");
+ manager.launchActivity(2,"RemoteActivity", b2);
+ //Device 3
+ Bundle b3 = new Bundle();
+ b3.putInt("resourceNum",1);
+ b3.putString("resource1","assets/split1_8_5.jpg");
+ manager.launchActivity(3,"RemoteActivity", b3);
+ //Device 4
+ Bundle b4 = new Bundle();
+ b4.putInt("resourceNum",1);
+ b4.putString("resource1","assets/split1_8_6.jpg");
+ manager.launchActivity(4,"RemoteActivity", b4);
+ //Device 5
+ Bundle b5 = new Bundle();
+ b5.putInt("resourceNum",1);
+ b5.putString("resource1","assets/split1_8_7.jpg");
+ manager.launchActivity(5,"RemoteActivity", b5);
+ //Device 6
+ Bundle b6 = new Bundle();
+ b6.putInt("resourceNum",1);
+ b6.putString("resource1","assets/split1_8_8.jpg");
+ manager.launchActivity(6,"RemoteActivity", b6);
+ //Device 7
+ Bundle b7 = new Bundle();
+ b7.putInt("resourceNum",1);
+ b7.putString("resource1","assets/split1_8_9.jpg");
+ manager.launchActivity(7,"RemoteActivity", b7);
+ //Local
+ //localMosaicProcess("split1_8_1.jpg");
+ }
+ }catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public void localMosaicProcess(Bitmap local_b){
+ localimage.setImageBitmap(null);
+
+ final MekoMosaic mekoMosaic = new MekoMosaic(local_b);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ boolean result = false;
+ Log.d("samd experiment", "meko Mosaic Start");
+ result = mekoMosaic.MosaicProcess();
+ if (result) {
+ Log.d("samd experiment", "meko Mosaic End");
+ }
+ }
+ }).start();
+ localimage.post(new Runnable() {
+ @Override
+ public void run() {
+ localimage.setImageBitmap(mekoMosaic.bm);
+ localimage.postDelayed(this, 100);
+ }
+ });
+// ComponentName compName = new ComponentName(
+// "com.singlemosaic.test", "com.singlemosaic.test.LocalActivity");
+//
+// Intent intent = new Intent(Intent.ACTION_MAIN);
+// intent.setComponent(compName);
+//
+// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+// intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+//
+// String resListarray[] = new String[1];
+// resListarray[0] = s;
+//
+// intent.putExtra("SAWR", resListarray);
+//
+// startActivity(intent);
+ }
+ @Override
+ public void onSAMDMsg(SAMDMessage message) {
+ final android.service.samd.SAMDMessage msg = message;
+ runOnUiThread(new Runnable() {
+ public void run() {
+ //Code goes here
+ String sendString = msg.getMessage();
+ int deviceNum = msg.getFromDN();
+ Log.d("sbjsbj", sendString);
+ handleMsg(deviceNum, sendString);
+ }
+ });
+ }
+ public void handleMsg(int player, String msg)
+ {
+ if(player==1){
+ Bitmap Bimage1 = BitmapFactory.decodeFile(msg).copy(Bitmap.Config.ARGB_8888, true);
+ image1.setImageBitmap(Bimage1);
+ }else if(player==2){
+ Bitmap Bimage2 = BitmapFactory.decodeFile(msg).copy(Bitmap.Config.ARGB_8888, true);
+ image2.setImageBitmap(Bimage2);
+ }else if(player==3){
+ Bitmap Bimage3 = BitmapFactory.decodeFile(msg).copy(Bitmap.Config.ARGB_8888, true);
+ image3.setImageBitmap(Bimage3);
+ }else if(player==4){
+ Bitmap Bimage4 = BitmapFactory.decodeFile(msg).copy(Bitmap.Config.ARGB_8888, true);
+ image4.setImageBitmap(Bimage4);
+ }
+
+ }
+}
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MergeTest.java SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MergeTest.java
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MergeTest.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/MergeTest.java 2017-08-29 02:04:13.000000000 +0900
@@ -0,0 +1,326 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mekomosaic.test;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+
+import dcs.meko.mosaic.mekomosaic.MekoMosaic;
+
+public class MergeTest extends Activity {
+
+
+ private static final String TAG = "TestApp";
+
+ Button btn_merge1_1, btn_merge1_2, btn_merge1_3, btn_merge1_4, btn_merge1_5,
+ btn_merge1_6, btn_merge1_7, btn_merge1_8;
+ @Override
+ protected void onCreate(Bundle icicle) {
+
+ super.onCreate(icicle);
+ setContentView(R.layout.merge_image);
+
+ btn_merge1_1 = (Button)findViewById(R.id.btn_merge1_1);
+ btn_merge1_1.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+
+ Log.d("samd experiment", "mosaic decode start 1_1");
+ Bitmap split1_1_1 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_1_1.jpg");
+ Bitmap split1_1_2 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_1_2.jpg");
+ Log.d("samd experiment", "mosaic decode start 1_1");
+
+ Log.d("samd experiment", "mosaic merge start 1_1");
+ Bitmap result = combineImage(split1_1_1,split1_1_2,true);
+ Log.d("samd experiment", "mosaic merge end 1_1");
+
+ Log.d("samd experiment", "mosaic mergeImage save start");
+ saveBitmaptoJpeg(result, "mosaicresult","mosaicResult1_1");
+ Log.d("samd experiment", "mosaic mergeImage save end");
+ }
+ });
+ btn_merge1_2 = (Button)findViewById(R.id.btn_merge1_2);
+ btn_merge1_2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "mosaic decode start 1_2");
+ Bitmap split1_2_1 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_2_1.jpg");
+ Bitmap split1_2_2 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_2_2.jpg");
+ Bitmap split1_2_3 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_2_3.jpg");
+ Log.d("samd experiment", "mosaic decode start 1_2");
+
+ Log.d("samd experiment", "mosaic merge start 1_2");
+ Bitmap temp = combineImage(split1_2_1,split1_2_2,true);
+ Bitmap result = combineImage(temp,split1_2_3,true);
+ Log.d("samd experiment", "mosaic merge end 1_2");
+
+ Log.d("samd experiment", "mosaic mergeImage save start");
+ saveBitmaptoJpeg(result, "mosaicresult","mosaicResult1_2");
+ Log.d("samd experiment", "mosaic mergeImage save end");
+ }
+ });
+ btn_merge1_3 =(Button) findViewById(R.id.btn_merge1_3);
+ btn_merge1_3.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "mosaic decode start 1_3");
+ Bitmap split1_3_1 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_3_1.jpg");
+ Bitmap split1_3_2 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_3_2.jpg");
+ Bitmap split1_3_3 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_3_3.jpg");
+ Bitmap split1_3_4 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_3_4.jpg");
+ Log.d("samd experiment", "mosaic decode start 1_3");
+
+ Log.d("samd experiment", "mosaic merge start 1_3");
+ Bitmap temp = combineImage(split1_3_1,split1_3_2,true);
+ Bitmap temp2 = combineImage(split1_3_3,split1_3_4,true);
+ Bitmap result = combineImage(temp, temp2, true);
+ Log.d("samd experiment", "mosaic merge end 1_3");
+
+ Log.d("samd experiment", "mosaic mergeImage save start");
+ saveBitmaptoJpeg(result, "mosaicresult","mosaicResult1_3");
+ Log.d("samd experiment", "mosaic mergeImage save end");
+ }
+ });
+ btn_merge1_4 =(Button) findViewById(R.id.btn_merge1_4);
+ btn_merge1_4.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "mosaic decode start 1_4");
+ Bitmap split1_4_1 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_4_1.jpg");
+ Bitmap split1_4_2 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_4_2.jpg");
+ Bitmap split1_4_3 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_4_3.jpg");
+ Bitmap split1_4_4 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_4_4.jpg");
+ Bitmap split1_4_5 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_4_5.jpg");
+ Log.d("samd experiment", "mosaic decode start 1_4");
+
+ Log.d("samd experiment", "mosaic merge start 1_4");
+ Bitmap temp = combineImage(split1_4_1,split1_4_2,true);
+ Bitmap temp2 = combineImage(split1_4_3,split1_4_4,true);
+ Bitmap temp3 = combineImage(temp2,split1_4_5,true);
+ Bitmap result = combineImage(temp, temp3, true);
+ Log.d("samd experiment", "mosaic merge end 1_4");
+
+ Log.d("samd experiment", "mosaic mergeImage save start");
+ saveBitmaptoJpeg(result, "mosaicresult","mosaicResult1_4");
+ Log.d("samd experiment", "mosaic mergeImage save end");
+ }
+ });
+ btn_merge1_5 =(Button) findViewById(R.id.btn_merge1_5);
+ btn_merge1_5.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "mosaic decode start 1_5");
+ Bitmap split1_5_1 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_5_1.jpg");
+ Bitmap split1_5_2 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_5_2.jpg");
+ Bitmap split1_5_3 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_5_3.jpg");
+ Bitmap split1_5_4 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_5_4.jpg");
+ Bitmap split1_5_5 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_5_5.jpg");
+ Bitmap split1_5_6 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_5_6.jpg");
+ Log.d("samd experiment", "mosaic decode start 1_5");
+
+ Log.d("samd experiment", "mosaic merge start 1_5");
+ Bitmap temp = combineImage(split1_5_1,split1_5_2,true);
+ Bitmap temp2 = combineImage(split1_5_3,split1_5_4,true);
+ Bitmap temp3 = combineImage(split1_5_5,split1_5_6,true);
+
+ Bitmap result1 = combineImage(temp,temp2,true);
+
+ Bitmap result = combineImage(result1,temp3,true);
+ Log.d("samd experiment", "mosaic temp end 1_5");
+
+ Log.d("samd experiment", "mosaic mergeImage save start");
+ saveBitmaptoJpeg(result, "mosaicresult","mosaicResult1_5");
+ Log.d("samd experiment", "mosaic mergeImage save end");
+ }
+ });
+ btn_merge1_6 =(Button) findViewById(R.id.btn_merge1_6);
+ btn_merge1_6.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "mosaic decode start 1_6");
+ Bitmap split1_6_1 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_6_1.jpg");
+ Bitmap split1_6_2 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_6_2.jpg");
+ Bitmap split1_6_3 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_6_3.jpg");
+ Bitmap split1_6_4 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_6_4.jpg");
+ Bitmap split1_6_5 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_6_5.jpg");
+ Bitmap split1_6_6 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_6_6.jpg");
+ Bitmap split1_6_7 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_6_7.jpg");
+ Log.d("samd experiment", "mosaic decode start 1_6");
+
+ Log.d("samd experiment", "mosaic merge start 1_6");
+ Bitmap temp = combineImage(split1_6_1,split1_6_2,true);
+ Bitmap temp2 = combineImage(split1_6_3,split1_6_4,true);
+ Bitmap temp3 = combineImage(split1_6_5,split1_6_6,true);
+
+ Bitmap result1 = combineImage(temp,temp2,true);
+ Bitmap result2 = combineImage(result1,temp3,true);
+
+ Bitmap result = combineImage(result2,split1_6_7,true);
+ Log.d("samd experiment", "mosaic temp end 1_6");
+
+ Log.d("samd experiment", "mosaic mergeImage save start");
+ saveBitmaptoJpeg(result, "mosaicresult","mosaicResult1_6");
+ Log.d("samd experiment", "mosaic mergeImage save end");
+ }
+ });
+ btn_merge1_7 =(Button) findViewById(R.id.btn_merge1_7);
+ btn_merge1_7.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "mosaic decode start 1_7");
+ Bitmap split1_7_1 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_7_1.jpg");
+ Bitmap split1_7_2 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_7_2.jpg");
+ Bitmap split1_7_3 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_7_3.jpg");
+ Bitmap split1_7_4 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_7_4.jpg");
+ Bitmap split1_7_5 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_7_5.jpg");
+ Bitmap split1_7_6 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_7_6.jpg");
+ Bitmap split1_7_7 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_7_7.jpg");
+ Bitmap split1_7_8 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_7_8.jpg");
+ Log.d("samd experiment", "mosaic decode start 1_7");
+
+ Log.d("samd experiment", "mosaic merge start 1_7");
+ Bitmap temp = combineImage(split1_7_1,split1_7_2,true);
+ Bitmap temp2 = combineImage(split1_7_3,split1_7_4,true);
+ Bitmap temp3 = combineImage(split1_7_5,split1_7_6,true);
+ Bitmap temp4 = combineImage(split1_7_7,split1_7_8,true);
+
+ Bitmap result1 = combineImage(temp,temp2,true);
+ Bitmap result2 = combineImage(temp3,temp4,true);
+
+ Bitmap result = combineImage(result1,result2,true);
+ Log.d("samd experiment", "mosaic temp end 1_7");
+
+ Log.d("samd experiment", "mosaic mergeImage save start");
+ saveBitmaptoJpeg(result, "mosaicresult","mosaicResult1_7");
+ Log.d("samd experiment", "mosaic mergeImage save end");
+ }
+ });
+ btn_merge1_8 =(Button) findViewById(R.id.btn_merge1_8);
+ btn_merge1_8.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment", "mosaic decode start 1_8");
+ Bitmap split1_8_1 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_8_1.jpg");
+ Bitmap split1_8_2 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_8_2.jpg");
+ Bitmap split1_8_3 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_8_3.jpg");
+ Bitmap split1_8_4 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_8_4.jpg");
+ Bitmap split1_8_5 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_8_5.jpg");
+ Bitmap split1_8_6 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_8_6.jpg");
+ Bitmap split1_8_7 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_8_7.jpg");
+ Bitmap split1_8_8 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_8_8.jpg");
+ Bitmap split1_8_9 = BitmapFactory.
+ decodeFile("/data/collaboroid/preprocess/MosaicApp/mosaicSplitTest/split1_8_9.jpg");
+ Log.d("samd experiment", "mosaic decode start 1_8");
+
+ Log.d("samd experiment", "mosaic merge start 1_8");
+ Bitmap temp = combineImage(split1_8_1,split1_8_2,true);
+ Bitmap temp2 = combineImage(split1_8_3,split1_8_4,true);
+ Bitmap temp3 = combineImage(split1_8_5,split1_8_6,true);
+ Bitmap temp4 = combineImage(split1_8_7,split1_8_8,true);
+
+ Bitmap result1 = combineImage(temp,temp2,true);
+ Bitmap result2 = combineImage(temp3,temp4,true);
+ Bitmap result3 = combineImage(result1,result2,true);
+
+ Bitmap result = combineImage(result3,split1_8_9,true);
+ Log.d("samd experiment", "mosaic temp end 1_8");
+
+ Log.d("samd experiment", "mosaic mergeImage save start");
+ saveBitmaptoJpeg(result, "mosaicresult","mosaicResult1_8");
+ Log.d("samd experiment", "mosaic mergeImage save end");
+ }
+ });
+ }
+ private Bitmap combineImage(Bitmap first, Bitmap second, boolean isVerticalMode){
+ BitmapFactory.Options option = new BitmapFactory.Options();
+ option.inDither = true;
+ option.inPurgeable = true;
+ Bitmap bitmap = null;
+ if(isVerticalMode)
+ bitmap = Bitmap.createScaledBitmap(first, first.getWidth(), first.getHeight()+second.getHeight(), true);
+ else
+ bitmap = Bitmap.createScaledBitmap(first, first.getWidth()+second.getWidth(), first.getHeight(), true);
+ Paint p = new Paint();
+ p.setDither(true);
+ p.setFlags(Paint.ANTI_ALIAS_FLAG);
+ Canvas c = new Canvas(bitmap);
+ c.drawBitmap(first, 0, 0, p);
+ if(isVerticalMode)
+ c.drawBitmap(second, 0, first.getHeight(), p);
+ else
+ c.drawBitmap(second, first.getWidth(), 0, p);
+ first.recycle();
+ second.recycle();
+ return bitmap;
+ }
+}
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/RemoteActivity.java SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/RemoteActivity.java
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/RemoteActivity.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/RemoteActivity.java 2017-09-22 00:51:47.564200000 +0900
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mekomosaic.test;
+
+import android.app.Activity;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import android.service.samd.SAMDManager;
+import android.util.Log;
+import android.widget.*;
+import android.os.Bundle;
+
+import java.util.List;
+
+import dcs.meko.mosaic.mekomosaic.MekoMosaic;
+
+public class RemoteActivity extends Activity {
+ //MEKO MOSAIC
+ public Bitmap bm;
+
+ ImageView remoteimage;
+ MekoMosaic mekoMosaic;
+ SAMDManager manager;
+ @Override
+ protected void onCreate(Bundle icicle) {
+ Log.d("samd experiment", "RemoteActivity Show");
+ super.onCreate(icicle);
+ setContentView(R.layout.remotedevice);
+
+ Bundle extras = getIntent().getExtras();
+ final String[] arrayB = extras.getStringArray("SAWR");
+
+ manager = new SAMDManager(getApplicationContext());
+
+ remoteimage = (ImageView)findViewById(R.id.remoteimage);
+
+ if(arrayB != null){
+ if (arrayB.length!=0){
+ try {
+ bm = BitmapFactory.decodeStream(getAssets().open(arrayB[0]))
+ .copy(Bitmap.Config.ARGB_8888, true);
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
+ mekoMosaic = new MekoMosaic(bm);
+ remoteimage.setImageBitmap(mekoMosaic.bm);
+
+ remoteimage.post(new Runnable() {
+ @Override
+ public void run() {
+ remoteimage.setImageBitmap(mekoMosaic.bm);
+ remoteimage.postDelayed(this, 100);
+ }
+ });
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ boolean send = false;
+ Log.d("samd experiment", "meko Mosaic Start");
+ send = mekoMosaic.MosaicProcess();
+ if(send){
+ Log.d("samd experiment", "meko Mosaic End");
+
+ saveBitmaptoJpeg(mekoMosaic.bm,"mosaicremote", "m_"+arrayB[0].split("\\.")[0]);
+ Bundle b = new Bundle();
+ b.putInt("resourceNum",1);
+ b.putString("resource1","mosaicremote/m_"+arrayB[0]);
+
+ manager.sendResourcesToLocal(b);
+ }
+ }
+ }).start();
+ }
+ }
+ }
+}
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/SplitTest.java SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/SplitTest.java
--- Android_6.0.1_r11/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/SplitTest.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/MekoMosaicApp/src/com/mekomosaic/test/SplitTest.java 2017-08-30 11:34:13.000000000 +0900
@@ -0,0 +1,259 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.mekomosaic.test;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Point;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import android.graphics.Bitmap;
+import android.util.Log;
+
+import dcs.meko.mosaic.mekomosaic.MekoMosaic;
+
+public class SplitTest extends Activity {
+
+ private static final String TAG = "TestApp";
+ Button btn_split1_1, btn_split1_2, btn_split1_3, btn_split1_4, btn_split1_5,
+ btn_split1_6, btn_split1_7, btn_split1_8;
+ Bitmap bm;
+ @Override
+ protected void onCreate(Bundle icicle) {
+
+ super.onCreate(icicle);
+ setContentView(R.layout.split_image);
+ try {
+ bm = BitmapFactory.decodeStream(getAssets().open("collaboroid/drawable/local-resize.jpg"))
+ .copy(Bitmap.Config.ARGB_8888, true);
+ Log.d("samd experiment","load local-resize.jpg");
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
+ saveBitmaptoJpeg(bm,"mosaicSplitTest","local");
+
+ btn_split1_1 =(Button) findViewById(R.id.btn_split1_1);
+ btn_split1_1.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment","split time start 1_1");
+ Bitmap split1_1_1 = bm.createBitmap(bm, 0, 0, bm.getWidth(), (bm.getHeight()/2));
+ Bitmap split1_1_2 = bm.createBitmap(bm, 0, bm.getHeight()/2, bm.getWidth(), (bm.getHeight()/2));
+ Log.d("samd experiment","split time end 1_2");
+
+ Log.d("samd experiment","save time start 1_1");
+ saveBitmaptoJpeg(split1_1_1,"mosaicSplitTest","split1_1_1");
+ saveBitmaptoJpeg(split1_1_2,"mosaicSplitTest","split1_1_2");
+ Log.d("samd experiment","save time end 1_1");
+ }
+ });
+
+ btn_split1_2 =(Button) findViewById(R.id.btn_split1_2);
+ btn_split1_2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment","split time start 1_2");
+ Bitmap split1_2_1 = bm.createBitmap(bm, 0, 0, bm.getWidth(), (bm.getHeight()/3));
+ Bitmap split1_2_2 = bm.createBitmap(bm, 0, (bm.getHeight()/3), bm.getWidth(), (bm.getHeight()/3));
+ Bitmap split1_2_3 = bm.createBitmap(bm, 0, (bm.getHeight()/3)*2, bm.getWidth(), (bm.getHeight()/3));
+ Log.d("samd experiment","split time end 1_2");
+
+ Log.d("samd experiment","save time start 1_2");
+ saveBitmaptoJpeg(split1_2_1,"mosaicSplitTest","split1_2_1");
+ saveBitmaptoJpeg(split1_2_2,"mosaicSplitTest","split1_2_2");
+ saveBitmaptoJpeg(split1_2_3,"mosaicSplitTest","split1_2_3");
+ Log.d("samd experiment","save time end 1_2");
+ }
+ });
+ btn_split1_3 =(Button) findViewById(R.id.btn_split1_3);
+ btn_split1_3.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment","split time start 1_3");
+ Bitmap split1_3_1 = bm.createBitmap(bm, 0, 0, bm.getWidth(), (bm.getHeight()/4));
+ Bitmap split1_3_2 = bm.createBitmap(bm, 0, (bm.getHeight()/4), bm.getWidth(), (bm.getHeight()/4));
+ Bitmap split1_3_3 = bm.createBitmap(bm, 0, (bm.getHeight()/4)*2, bm.getWidth(), (bm.getHeight()/4));
+ Bitmap split1_3_4 = bm.createBitmap(bm, 0, (bm.getHeight()/4)*3, bm.getWidth(), (bm.getHeight()/4));
+ Log.d("samd experiment","split time end 1_3");
+
+ Log.d("samd experiment","save time start 1_3");
+ saveBitmaptoJpeg(split1_3_1,"mosaicSplitTest","split1_3_1");
+ saveBitmaptoJpeg(split1_3_2,"mosaicSplitTest","split1_3_2");
+ saveBitmaptoJpeg(split1_3_3,"mosaicSplitTest","split1_3_3");
+ saveBitmaptoJpeg(split1_3_4,"mosaicSplitTest","split1_3_4");
+ Log.d("samd experiment","save time end 1_3");
+ }
+ });
+ btn_split1_4 =(Button) findViewById(R.id.btn_split1_4);
+ btn_split1_4.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment","split time start 1_4");
+ Bitmap split1_4_1 = bm.createBitmap(bm, 0, 0, bm.getWidth(), (bm.getHeight()/5));
+ Bitmap split1_4_2 = bm.createBitmap(bm, 0, (bm.getHeight()/5), bm.getWidth(), (bm.getHeight()/5));
+ Bitmap split1_4_3 = bm.createBitmap(bm, 0, (bm.getHeight()/5)*2, bm.getWidth(), (bm.getHeight()/5));
+ Bitmap split1_4_4 = bm.createBitmap(bm, 0, (bm.getHeight()/5)*3, bm.getWidth(), (bm.getHeight()/5));
+ Bitmap split1_4_5 = bm.createBitmap(bm, 0, (bm.getHeight()/5)*4, bm.getWidth(), (bm.getHeight()/5));
+ Log.d("samd experiment","split time end 1_4");
+
+ Log.d("samd experiment","save time start 1_4");
+ saveBitmaptoJpeg(split1_4_1,"mosaicSplitTest","split1_4_1");
+ saveBitmaptoJpeg(split1_4_2,"mosaicSplitTest","split1_4_2");
+ saveBitmaptoJpeg(split1_4_3,"mosaicSplitTest","split1_4_3");
+ saveBitmaptoJpeg(split1_4_4,"mosaicSplitTest","split1_4_4");
+ saveBitmaptoJpeg(split1_4_5,"mosaicSplitTest","split1_4_5");
+ Log.d("samd experiment","save time end 1_4");
+ }
+ });
+ btn_split1_5 =(Button) findViewById(R.id.btn_split1_5);
+ btn_split1_5.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment","split time start 1_5");
+ Bitmap split1_5_1 = bm.createBitmap(bm, 0, 0, bm.getWidth(), (bm.getHeight()/6));
+ Bitmap split1_5_2 = bm.createBitmap(bm, 0, (bm.getHeight()/6), bm.getWidth(), (bm.getHeight()/6));
+ Bitmap split1_5_3 = bm.createBitmap(bm, 0, (bm.getHeight()/6)*2, bm.getWidth(), (bm.getHeight()/6));
+ Bitmap split1_5_4 = bm.createBitmap(bm, 0, (bm.getHeight()/6)*3, bm.getWidth(), (bm.getHeight()/6));
+ Bitmap split1_5_5 = bm.createBitmap(bm, 0, (bm.getHeight()/6)*4, bm.getWidth(), (bm.getHeight()/6));
+ Bitmap split1_5_6 = bm.createBitmap(bm, 0, (bm.getHeight()/6)*5, bm.getWidth(), (bm.getHeight()/6));
+ Log.d("samd experiment","split time end 1_5");
+
+ Log.d("samd experiment","save time start 1_5");
+ saveBitmaptoJpeg(split1_5_1,"mosaicSplitTest","split1_5_1");
+ saveBitmaptoJpeg(split1_5_2,"mosaicSplitTest","split1_5_2");
+ saveBitmaptoJpeg(split1_5_3,"mosaicSplitTest","split1_5_3");
+ saveBitmaptoJpeg(split1_5_4,"mosaicSplitTest","split1_5_4");
+ saveBitmaptoJpeg(split1_5_5,"mosaicSplitTest","split1_5_5");
+ saveBitmaptoJpeg(split1_5_6,"mosaicSplitTest","split1_5_6");
+ Log.d("samd experiment","save time end 1_5");
+ }
+ });
+ btn_split1_6 =(Button) findViewById(R.id.btn_split1_6);
+ btn_split1_6.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment","split time start 1_6");
+ Bitmap split1_6_1 = bm.createBitmap(bm, 0, 0, bm.getWidth(), (bm.getHeight()/7));
+ Bitmap split1_6_2 = bm.createBitmap(bm, 0, (bm.getHeight()/7), bm.getWidth(), (bm.getHeight()/7));
+ Bitmap split1_6_3 = bm.createBitmap(bm, 0, (bm.getHeight()/7)*2, bm.getWidth(), (bm.getHeight()/7));
+ Bitmap split1_6_4 = bm.createBitmap(bm, 0, (bm.getHeight()/7)*3, bm.getWidth(), (bm.getHeight()/7));
+ Bitmap split1_6_5 = bm.createBitmap(bm, 0, (bm.getHeight()/7)*4, bm.getWidth(), (bm.getHeight()/7));
+ Bitmap split1_6_6 = bm.createBitmap(bm, 0, (bm.getHeight()/7)*5, bm.getWidth(), (bm.getHeight()/7));
+ Bitmap split1_6_7 = bm.createBitmap(bm, 0, (bm.getHeight()/7)*6, bm.getWidth(), (bm.getHeight()/7));
+ Log.d("samd experiment","split time end 1_6");
+
+ Log.d("samd experiment","save time start 1_6");
+ saveBitmaptoJpeg(split1_6_1,"mosaicSplitTest","split1_6_1");
+ saveBitmaptoJpeg(split1_6_2,"mosaicSplitTest","split1_6_2");
+ saveBitmaptoJpeg(split1_6_3,"mosaicSplitTest","split1_6_3");
+ saveBitmaptoJpeg(split1_6_4,"mosaicSplitTest","split1_6_4");
+ saveBitmaptoJpeg(split1_6_5,"mosaicSplitTest","split1_6_5");
+ saveBitmaptoJpeg(split1_6_6,"mosaicSplitTest","split1_6_6");
+ saveBitmaptoJpeg(split1_6_7,"mosaicSplitTest","split1_6_7");
+ Log.d("samd experiment","save time end 1_6");
+ }
+ });
+ btn_split1_7 =(Button) findViewById(R.id.btn_split1_7);
+ btn_split1_7.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment","split time start 1_7");
+ Bitmap split1_7_1 = bm.createBitmap(bm, 0, 0, bm.getWidth(), (bm.getHeight()/8));
+ Bitmap split1_7_2 = bm.createBitmap(bm, 0, (bm.getHeight()/8), bm.getWidth(), (bm.getHeight()/8));
+ Bitmap split1_7_3 = bm.createBitmap(bm, 0, (bm.getHeight()/8)*2, bm.getWidth(), (bm.getHeight()/8));
+ Bitmap split1_7_4 = bm.createBitmap(bm, 0, (bm.getHeight()/8)*3, bm.getWidth(), (bm.getHeight()/8));
+ Bitmap split1_7_5 = bm.createBitmap(bm, 0, (bm.getHeight()/8)*4, bm.getWidth(), (bm.getHeight()/8));
+ Bitmap split1_7_6 = bm.createBitmap(bm, 0, (bm.getHeight()/8)*5, bm.getWidth(), (bm.getHeight()/8));
+ Bitmap split1_7_7 = bm.createBitmap(bm, 0, (bm.getHeight()/8)*6, bm.getWidth(), (bm.getHeight()/8));
+ Bitmap split1_7_8 = bm.createBitmap(bm, 0, (bm.getHeight()/8)*7, bm.getWidth(), (bm.getHeight()/8));
+ Log.d("samd experiment","split time end 1_7");
+
+ Log.d("samd experiment","save time start 1_7");
+ saveBitmaptoJpeg(split1_7_1,"mosaicSplitTest","split1_7_1");
+ saveBitmaptoJpeg(split1_7_2,"mosaicSplitTest","split1_7_2");
+ saveBitmaptoJpeg(split1_7_3,"mosaicSplitTest","split1_7_3");
+ saveBitmaptoJpeg(split1_7_4,"mosaicSplitTest","split1_7_4");
+ saveBitmaptoJpeg(split1_7_5,"mosaicSplitTest","split1_7_5");
+ saveBitmaptoJpeg(split1_7_6,"mosaicSplitTest","split1_7_6");
+ saveBitmaptoJpeg(split1_7_7,"mosaicSplitTest","split1_7_7");
+ saveBitmaptoJpeg(split1_7_8,"mosaicSplitTest","split1_7_8");
+ Log.d("samd experiment","save time end 1_7");
+ }
+ });
+ btn_split1_8 =(Button) findViewById(R.id.btn_split1_8);
+ btn_split1_8.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd experiment","split time start 1_8");
+ Bitmap split1_8_1 = bm.createBitmap(bm, 0, 0, bm.getWidth(), (bm.getHeight()/9));
+ Bitmap split1_8_2 = bm.createBitmap(bm, 0, (bm.getHeight()/9), bm.getWidth(), (bm.getHeight()/9));
+ Bitmap split1_8_3 = bm.createBitmap(bm, 0, (bm.getHeight()/9)*2, bm.getWidth(), (bm.getHeight()/9));
+ Bitmap split1_8_4 = bm.createBitmap(bm, 0, (bm.getHeight()/9)*3, bm.getWidth(), (bm.getHeight()/9));
+ Bitmap split1_8_5 = bm.createBitmap(bm, 0, (bm.getHeight()/9)*4, bm.getWidth(), (bm.getHeight()/9));
+ Bitmap split1_8_6 = bm.createBitmap(bm, 0, (bm.getHeight()/9)*5, bm.getWidth(), (bm.getHeight()/9));
+ Bitmap split1_8_7 = bm.createBitmap(bm, 0, (bm.getHeight()/9)*6, bm.getWidth(), (bm.getHeight()/9));
+ Bitmap split1_8_8 = bm.createBitmap(bm, 0, (bm.getHeight()/9)*7, bm.getWidth(), (bm.getHeight()/9));
+ Bitmap split1_8_9 = bm.createBitmap(bm, 0, (bm.getHeight()/9)*8, bm.getWidth(), (bm.getHeight()/9));
+ Log.d("samd experiment","split time end 1_8");
+
+ Log.d("samd experiment","save time start 1_8");
+ saveBitmaptoJpeg(split1_8_1,"mosaicSplitTest","split1_8_1");
+ saveBitmaptoJpeg(split1_8_2,"mosaicSplitTest","split1_8_2");
+ saveBitmaptoJpeg(split1_8_3,"mosaicSplitTest","split1_8_3");
+ saveBitmaptoJpeg(split1_8_4,"mosaicSplitTest","split1_8_4");
+ saveBitmaptoJpeg(split1_8_5,"mosaicSplitTest","split1_8_5");
+ saveBitmaptoJpeg(split1_8_6,"mosaicSplitTest","split1_8_6");
+ saveBitmaptoJpeg(split1_8_7,"mosaicSplitTest","split1_8_7");
+ saveBitmaptoJpeg(split1_8_8,"mosaicSplitTest","split1_8_8");
+ saveBitmaptoJpeg(split1_8_9,"mosaicSplitTest","split1_8_9");
+ Log.d("samd experiment","save time end 1_8");
+ }
+ });
+
+
+ }
+}
Binary files Android_6.0.1_r11/packages/apps/Messaging/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Messaging/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Music/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Music/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/MusicFX/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/MusicFX/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Nfc/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Nfc/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/OneTimeInitializer/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/OneTimeInitializer/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/PackageInstaller/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/PackageInstaller/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Phone/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Phone/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/PhoneCommon/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/PhoneCommon/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Protips/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Protips/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/Provision/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Provision/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/QuickSearchBox/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/QuickSearchBox/.git/index differ
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/ResetSAMD/AndroidManifest.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/AndroidManifest.xml 2017-09-21 13:27:51.465215000 +0900
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/Android.mk SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/Android.mk
--- Android_6.0.1_r11/packages/apps/ResetSAMD/Android.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/Android.mk 2017-08-27 06:52:25.000000000 +0900
@@ -0,0 +1,12 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := ResetSAMD
+
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_PACKAGE)
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/assets/collaboroid/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/assets/collaboroid/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/ResetSAMD/assets/collaboroid/AndroidManifest.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/assets/collaboroid/AndroidManifest.xml 2017-03-17 02:08:16.000000000 +0900
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Binary files Android_6.0.1_r11/packages/apps/ResetSAMD/assets/collaboroid/drawable/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/assets/collaboroid/drawable/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/ResetSAMD/assets/collaboroid/drawable-xxhdpi/test2.JPG and SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/assets/collaboroid/drawable-xxhdpi/test2.JPG differ
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/assets/collaboroid/layout/remotedevice.xml SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/assets/collaboroid/layout/remotedevice.xml
--- Android_6.0.1_r11/packages/apps/ResetSAMD/assets/collaboroid/layout/remotedevice.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/assets/collaboroid/layout/remotedevice.xml 2017-06-16 09:52:06.000000000 +0900
@@ -0,0 +1,20 @@
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/assets/collaboroid/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/assets/collaboroid/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/ResetSAMD/assets/collaboroid/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/assets/collaboroid/values/dimens.xml 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/assets/collaboroid/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/assets/collaboroid/values/strings.xml
--- Android_6.0.1_r11/packages/apps/ResetSAMD/assets/collaboroid/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/assets/collaboroid/values/strings.xml 2017-05-16 19:49:32.000000000 +0900
@@ -0,0 +1,30 @@
+
+
+
+
+
+ MosaicApp
+ MosaicApp
+ Send Distribute Bitmap
+ Background
+ Single Mosaic
+ Single Mosaic2
+ SelectImage
+ Local
+ Remote
+ ----------
+ solo test
+
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/build.properties SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/build.properties
--- Android_6.0.1_r11/packages/apps/ResetSAMD/build.properties 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/build.properties 2017-02-27 16:07:46.000000000 +0900
@@ -0,0 +1 @@
+external.libs.dir=lib
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/CleanSpec.mk SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/CleanSpec.mk
--- Android_6.0.1_r11/packages/apps/ResetSAMD/CleanSpec.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/CleanSpec.mk 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,49 @@
+# Copyright (C) 2007 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
Binary files Android_6.0.1_r11/packages/apps/ResetSAMD/res/drawable/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/res/drawable/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/ResetSAMD/res/drawable-xhdpi/test2.JPG and SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/res/drawable-xhdpi/test2.JPG differ
Binary files Android_6.0.1_r11/packages/apps/ResetSAMD/res/drawable-xxhdpi/test2.JPG and SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/res/drawable-xxhdpi/test2.JPG differ
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/res/layout/activity_main.xml SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/res/layout/activity_main.xml
--- Android_6.0.1_r11/packages/apps/ResetSAMD/res/layout/activity_main.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/res/layout/activity_main.xml 2017-08-28 01:59:44.000000000 +0900
@@ -0,0 +1,18 @@
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/res/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/res/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/ResetSAMD/res/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/res/values/dimens.xml 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/res/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/res/values/strings.xml
--- Android_6.0.1_r11/packages/apps/ResetSAMD/res/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/res/values/strings.xml 2017-08-27 06:55:41.000000000 +0900
@@ -0,0 +1,21 @@
+
+
+
+
+
+ ResetSAMD
+ ResetSAMD
+
diff -urN Android_6.0.1_r11/packages/apps/ResetSAMD/src/com/reset/test/MainActivity.java SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/src/com/reset/test/MainActivity.java
--- Android_6.0.1_r11/packages/apps/ResetSAMD/src/com/reset/test/MainActivity.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/ResetSAMD/src/com/reset/test/MainActivity.java 2017-09-15 11:23:23.891487000 +0900
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.reset.test;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.*;
+
+import android.os.Bundle;
+import android.os.ServiceManager;
+import android.view.View;
+import android.widget.Button;
+
+import com.reset.test.R;
+
+public class MainActivity extends Activity {
+ private static final String TAG = "ResetSAMD";
+
+ Context mContext;
+
+ Button btn;
+ @Override
+ protected void onCreate(Bundle icicle) {
+
+ super.onCreate(icicle);
+ setContentView(R.layout.activity_main);
+
+ mContext = getApplicationContext();
+
+ btn = (Button)findViewById(R.id.test);
+ btn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+
+ }
+ });
+ }
+
+}
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/Settings/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/Settings/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/Settings/AndroidManifest.xml 2017-09-27 02:08:13.783735790 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/AndroidManifest.xml 2017-03-26 17:45:19.109875000 +0900
@@ -106,6 +106,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
-
-# This example catches duplicate Signed-off-by lines.
-
-test "" = "$(grep '^Signed-off-by: ' "$1" |
- sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
- echo >&2 Duplicate Signed-off-by lines.
- exit 1
-}
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/hooks/post-update.sample SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/post-update.sample
--- Android_6.0.1_r11/packages/apps/Settings/.git/hooks/post-update.sample 2017-09-26 19:03:13.940064059 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/post-update.sample 1970-01-01 09:00:00.000000000 +0900
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to prepare a packed repository for use over
-# dumb transports.
-#
-# To enable this hook, rename this file to "post-update".
-
-exec git update-server-info
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/hooks/pre-applypatch.sample SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/pre-applypatch.sample
--- Android_6.0.1_r11/packages/apps/Settings/.git/hooks/pre-applypatch.sample 2017-09-26 19:03:13.940064059 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/pre-applypatch.sample 1970-01-01 09:00:00.000000000 +0900
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed
-# by applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-applypatch".
-
-. git-sh-setup
-test -x "$GIT_DIR/hooks/pre-commit" &&
- exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
-:
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/hooks/pre-auto-gc SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/pre-auto-gc
--- Android_6.0.1_r11/packages/apps/Settings/.git/hooks/pre-auto-gc 2017-09-26 13:27:09.388766984 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/pre-auto-gc 1970-01-01 09:00:00.000000000 +0900
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify if you are on battery, in case you
-# are running Linux or OS X. Called by git-gc --auto with no arguments.
-# The hook should exit with non-zero status after issuing an appropriate
-# message if it wants to stop the auto repacking.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-if test -x /sbin/on_ac_power && /sbin/on_ac_power
-then
- exit 0
-elif test "$(cat /sys/class/power_supply/AC/online 2>/dev/null)" = 1
-then
- exit 0
-elif grep -q 'on-line' /proc/acpi/ac_adapter/AC/state 2>/dev/null
-then
- exit 0
-elif grep -q '0x01$' /proc/apm 2>/dev/null
-then
- exit 0
-elif grep -q "AC Power \+: 1" /proc/pmu/info 2>/dev/null
-then
- exit 0
-elif test -x /usr/bin/pmset && /usr/bin/pmset -g batt |
- grep -q "drawing from 'AC Power'"
-then
- exit 0
-elif test -d /sys/bus/acpi/drivers/battery && test 0 = \
- "$(find /sys/bus/acpi/drivers/battery/ -type l | wc -l)";
-then
- # No battery exists.
- exit 0
-fi
-
-echo "Auto packing deferred; not on AC"
-exit 1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/hooks/pre-commit.sample SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/pre-commit.sample
--- Android_6.0.1_r11/packages/apps/Settings/.git/hooks/pre-commit.sample 2017-09-26 19:03:13.940064059 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/pre-commit.sample 1970-01-01 09:00:00.000000000 +0900
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed.
-# Called by "git commit" with no arguments. The hook should
-# exit with non-zero status after issuing an appropriate message if
-# it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-commit".
-
-if git rev-parse --verify HEAD >/dev/null 2>&1
-then
- against=HEAD
-else
- # Initial commit: diff against an empty tree object
- against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-fi
-
-# If you want to allow non-ASCII filenames set this variable to true.
-allownonascii=$(git config --bool hooks.allownonascii)
-
-# Redirect output to stderr.
-exec 1>&2
-
-# Cross platform projects tend to avoid non-ASCII filenames; prevent
-# them from being added to the repository. We exploit the fact that the
-# printable range starts at the space character and ends with tilde.
-if [ "$allownonascii" != "true" ] &&
- # Note that the use of brackets around a tr range is ok here, (it's
- # even required, for portability to Solaris 10's /usr/bin/tr), since
- # the square bracket bytes happen to fall in the designated range.
- test $(git diff --cached --name-only --diff-filter=A -z $against |
- LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
-then
- cat <<\EOF
-Error: Attempt to add a non-ASCII file name.
-
-This can cause problems if you want to work with people on other platforms.
-
-To be portable it is advisable to rename the file.
-
-If you know what you are doing you can disable this check using:
-
- git config hooks.allownonascii true
-EOF
- exit 1
-fi
-
-# If there are whitespace errors, print the offending file names and fail.
-exec git diff-index --check --cached $against --
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/hooks/prepare-commit-msg.sample SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/prepare-commit-msg.sample
--- Android_6.0.1_r11/packages/apps/Settings/.git/hooks/prepare-commit-msg.sample 2017-09-26 19:03:13.940064059 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/prepare-commit-msg.sample 1970-01-01 09:00:00.000000000 +0900
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to prepare the commit log message.
-# Called by "git commit" with the name of the file that has the
-# commit message, followed by the description of the commit
-# message's source. The hook's purpose is to edit the commit
-# message file. If the hook fails with a non-zero status,
-# the commit is aborted.
-#
-# To enable this hook, rename this file to "prepare-commit-msg".
-
-# This hook includes three examples. The first comments out the
-# "Conflicts:" part of a merge commit.
-#
-# The second includes the output of "git diff --name-status -r"
-# into the message, just before the "git status" output. It is
-# commented because it doesn't cope with --amend or with squashed
-# commits.
-#
-# The third example adds a Signed-off-by line to the message, that can
-# still be edited. This is rarely a good idea.
-
-case "$2,$3" in
- merge,)
- /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
-
-# ,|template,)
-# /usr/bin/perl -i.bak -pe '
-# print "\n" . `git diff --cached --name-status -r`
-# if /^#/ && $first++ == 0' "$1" ;;
-
- *) ;;
-esac
-
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/hooks/pre-push.sample SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/pre-push.sample
--- Android_6.0.1_r11/packages/apps/Settings/.git/hooks/pre-push.sample 2017-09-26 19:03:13.940064059 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/pre-push.sample 1970-01-01 09:00:00.000000000 +0900
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-# An example hook script to verify what is about to be pushed. Called by "git
-# push" after it has checked the remote status, but before anything has been
-# pushed. If this script exits with a non-zero status nothing will be pushed.
-#
-# This hook is called with the following parameters:
-#
-# $1 -- Name of the remote to which the push is being done
-# $2 -- URL to which the push is being done
-#
-# If pushing without using a named remote those arguments will be equal.
-#
-# Information about the commits which are being pushed is supplied as lines to
-# the standard input in the form:
-#
-#
-#
-# This sample shows how to prevent push of commits where the log message starts
-# with "WIP" (work in progress).
-
-remote="$1"
-url="$2"
-
-z40=0000000000000000000000000000000000000000
-
-IFS=' '
-while read local_ref local_sha remote_ref remote_sha
-do
- if [ "$local_sha" = $z40 ]
- then
- # Handle delete
- :
- else
- if [ "$remote_sha" = $z40 ]
- then
- # New branch, examine all commits
- range="$local_sha"
- else
- # Update to existing branch, examine new commits
- range="$remote_sha..$local_sha"
- fi
-
- # Check for WIP commit
- commit=`git rev-list -n 1 --grep '^WIP' "$range"`
- if [ -n "$commit" ]
- then
- echo "Found WIP commit in $local_ref, not pushing"
- exit 1
- fi
- fi
-done
-
-exit 0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/hooks/pre-rebase.sample SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/pre-rebase.sample
--- Android_6.0.1_r11/packages/apps/Settings/.git/hooks/pre-rebase.sample 2017-09-26 19:03:13.940064059 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/pre-rebase.sample 1970-01-01 09:00:00.000000000 +0900
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006, 2008 Junio C Hamano
-#
-# The "pre-rebase" hook is run just before "git rebase" starts doing
-# its job, and can prevent the command from running by exiting with
-# non-zero status.
-#
-# The hook is called with the following parameters:
-#
-# $1 -- the upstream the series was forked from.
-# $2 -- the branch being rebased (or empty when rebasing the current branch).
-#
-# This sample shows how to prevent topic branches that are already
-# merged to 'next' branch from getting rebased, because allowing it
-# would result in rebasing already published history.
-
-publish=next
-basebranch="$1"
-if test "$#" = 2
-then
- topic="refs/heads/$2"
-else
- topic=`git symbolic-ref HEAD` ||
- exit 0 ;# we do not interrupt rebasing detached HEAD
-fi
-
-case "$topic" in
-refs/heads/??/*)
- ;;
-*)
- exit 0 ;# we do not interrupt others.
- ;;
-esac
-
-# Now we are dealing with a topic branch being rebased
-# on top of master. Is it OK to rebase it?
-
-# Does the topic really exist?
-git show-ref -q "$topic" || {
- echo >&2 "No such branch $topic"
- exit 1
-}
-
-# Is topic fully merged to master?
-not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
-if test -z "$not_in_master"
-then
- echo >&2 "$topic is fully merged to master; better remove it."
- exit 1 ;# we could allow it, but there is no point.
-fi
-
-# Is topic ever merged to next? If so you should not be rebasing it.
-only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
-only_next_2=`git rev-list ^master ${publish} | sort`
-if test "$only_next_1" = "$only_next_2"
-then
- not_in_topic=`git rev-list "^$topic" master`
- if test -z "$not_in_topic"
- then
- echo >&2 "$topic is already up-to-date with master"
- exit 1 ;# we could allow it, but there is no point.
- else
- exit 0
- fi
-else
- not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
- /usr/bin/perl -e '
- my $topic = $ARGV[0];
- my $msg = "* $topic has commits already merged to public branch:\n";
- my (%not_in_next) = map {
- /^([0-9a-f]+) /;
- ($1 => 1);
- } split(/\n/, $ARGV[1]);
- for my $elem (map {
- /^([0-9a-f]+) (.*)$/;
- [$1 => $2];
- } split(/\n/, $ARGV[2])) {
- if (!exists $not_in_next{$elem->[0]}) {
- if ($msg) {
- print STDERR $msg;
- undef $msg;
- }
- print STDERR " $elem->[1]\n";
- }
- }
- ' "$topic" "$not_in_next" "$not_in_master"
- exit 1
-fi
-
-<<\DOC_END
-
-This sample hook safeguards topic branches that have been
-published from being rewound.
-
-The workflow assumed here is:
-
- * Once a topic branch forks from "master", "master" is never
- merged into it again (either directly or indirectly).
-
- * Once a topic branch is fully cooked and merged into "master",
- it is deleted. If you need to build on top of it to correct
- earlier mistakes, a new topic branch is created by forking at
- the tip of the "master". This is not strictly necessary, but
- it makes it easier to keep your history simple.
-
- * Whenever you need to test or publish your changes to topic
- branches, merge them into "next" branch.
-
-The script, being an example, hardcodes the publish branch name
-to be "next", but it is trivial to make it configurable via
-$GIT_DIR/config mechanism.
-
-With this workflow, you would want to know:
-
-(1) ... if a topic branch has ever been merged to "next". Young
- topic branches can have stupid mistakes you would rather
- clean up before publishing, and things that have not been
- merged into other branches can be easily rebased without
- affecting other people. But once it is published, you would
- not want to rewind it.
-
-(2) ... if a topic branch has been fully merged to "master".
- Then you can delete it. More importantly, you should not
- build on top of it -- other people may already want to
- change things related to the topic as patches against your
- "master", so if you need further changes, it is better to
- fork the topic (perhaps with the same name) afresh from the
- tip of "master".
-
-Let's look at this example:
-
- o---o---o---o---o---o---o---o---o---o "next"
- / / / /
- / a---a---b A / /
- / / / /
- / / c---c---c---c B /
- / / / \ /
- / / / b---b C \ /
- / / / / \ /
- ---o---o---o---o---o---o---o---o---o---o---o "master"
-
-
-A, B and C are topic branches.
-
- * A has one fix since it was merged up to "next".
-
- * B has finished. It has been fully merged up to "master" and "next",
- and is ready to be deleted.
-
- * C has not merged to "next" at all.
-
-We would want to allow C to be rebased, refuse A, and encourage
-B to be deleted.
-
-To compute (1):
-
- git rev-list ^master ^topic next
- git rev-list ^master next
-
- if these match, topic has not merged in next at all.
-
-To compute (2):
-
- git rev-list master..topic
-
- if this is empty, it is fully merged to "master".
-
-DOC_END
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/hooks/update.sample SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/update.sample
--- Android_6.0.1_r11/packages/apps/Settings/.git/hooks/update.sample 2017-09-26 19:03:13.940064059 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/hooks/update.sample 1970-01-01 09:00:00.000000000 +0900
@@ -1,128 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to blocks unannotated tags from entering.
-# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
-#
-# To enable this hook, rename this file to "update".
-#
-# Config
-# ------
-# hooks.allowunannotated
-# This boolean sets whether unannotated tags will be allowed into the
-# repository. By default they won't be.
-# hooks.allowdeletetag
-# This boolean sets whether deleting tags will be allowed in the
-# repository. By default they won't be.
-# hooks.allowmodifytag
-# This boolean sets whether a tag may be modified after creation. By default
-# it won't be.
-# hooks.allowdeletebranch
-# This boolean sets whether deleting branches will be allowed in the
-# repository. By default they won't be.
-# hooks.denycreatebranch
-# This boolean sets whether remotely creating branches will be denied
-# in the repository. By default this is allowed.
-#
-
-# --- Command line
-refname="$1"
-oldrev="$2"
-newrev="$3"
-
-# --- Safety check
-if [ -z "$GIT_DIR" ]; then
- echo "Don't run this script from the command line." >&2
- echo " (if you want, you could supply GIT_DIR then run" >&2
- echo " $0 [ )" >&2
- exit 1
-fi
-
-if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
- echo "usage: $0 ][ " >&2
- exit 1
-fi
-
-# --- Config
-allowunannotated=$(git config --bool hooks.allowunannotated)
-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
-denycreatebranch=$(git config --bool hooks.denycreatebranch)
-allowdeletetag=$(git config --bool hooks.allowdeletetag)
-allowmodifytag=$(git config --bool hooks.allowmodifytag)
-
-# check for no description
-projectdesc=$(sed -e '1q' "$GIT_DIR/description")
-case "$projectdesc" in
-"Unnamed repository"* | "")
- echo "*** Project description file hasn't been set" >&2
- exit 1
- ;;
-esac
-
-# --- Check types
-# if $newrev is 0000...0000, it's a commit to delete a ref.
-zero="0000000000000000000000000000000000000000"
-if [ "$newrev" = "$zero" ]; then
- newrev_type=delete
-else
- newrev_type=$(git cat-file -t $newrev)
-fi
-
-case "$refname","$newrev_type" in
- refs/tags/*,commit)
- # un-annotated tag
- short_refname=${refname##refs/tags/}
- if [ "$allowunannotated" != "true" ]; then
- echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
- echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
- exit 1
- fi
- ;;
- refs/tags/*,delete)
- # delete tag
- if [ "$allowdeletetag" != "true" ]; then
- echo "*** Deleting a tag is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- refs/tags/*,tag)
- # annotated tag
- if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
- then
- echo "*** Tag '$refname' already exists." >&2
- echo "*** Modifying a tag is not allowed in this repository." >&2
- exit 1
- fi
- ;;
- refs/heads/*,commit)
- # branch
- if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
- echo "*** Creating a branch is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- refs/heads/*,delete)
- # delete branch
- if [ "$allowdeletebranch" != "true" ]; then
- echo "*** Deleting a branch is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- refs/remotes/*,commit)
- # tracking branch
- ;;
- refs/remotes/*,delete)
- # delete tracking branch
- if [ "$allowdeletebranch" != "true" ]; then
- echo "*** Deleting a tracking branch is not allowed in this repository" >&2
- exit 1
- fi
- ;;
- *)
- # Anything else (is there anything else?)
- echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
- exit 1
- ;;
-esac
-
-# --- Finished
-exit 0
Binary files Android_6.0.1_r11/packages/apps/Settings/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/index differ
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/info/exclude SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/info/exclude
--- Android_6.0.1_r11/packages/apps/Settings/.git/info/exclude 2017-09-26 19:03:13.940064059 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/info/exclude 1970-01-01 09:00:00.000000000 +0900
@@ -1,6 +0,0 @@
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/donut-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/donut-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/donut-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/donut-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 7247d75a741609bcf498d24073260cf24ab9b08c hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/donut-release2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/donut-release2
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/donut-release2 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/donut-release2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 64b691a8abb2bbb2952cb44a7dc04f153d717bc3 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-passion-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-passion-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-passion-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-passion-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 ad76f17a1c75447047fc2791b65e93341925998b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 ad76f17a1c75447047fc2791b65e93341925998b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-sholes-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-sholes-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-sholes-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-sholes-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 18517f50edcfebf41b61965b24e360858db1c5e4 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-sholes-release2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-sholes-release2
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-sholes-release2 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/eclair-sholes-release2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 ad76f17a1c75447047fc2791b65e93341925998b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/froyo SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/froyo
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/froyo 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/froyo 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 f4d359d3c83d0e84319603ecc0f4dce120708612 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/froyo-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/froyo-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/froyo-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/froyo-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 50c529220a8af165df92f4aa6a52c3eec60282ee hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 9cb97c44eefff70fd0fc1c1b8dd7ba87f15ba9e6 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread-mr4-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread-mr4-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread-mr4-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread-mr4-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 a36690ebff7be78d31676db721667314f72af0aa hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/gingerbread-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 935b504a05f328cf90db3415b82ff4a7f51e628f hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-factoryrom-2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-factoryrom-2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-factoryrom-2-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-factoryrom-2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 850cb95af3949ca7967deea104844c800f7d4b62 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr0 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr0
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr0 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr0 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 fec195d7564b489fcdd814d066cfbf6af702132b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr0-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr0-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr0-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr0-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 009c1cc19e4254a4a6c923a981ea671d458317c5 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr1
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 1e2ba6221775d491ff9e895cddf823b492b4768e hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr1-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 815b2f3467aa1d1e98be7a0e2e8e5a6a8c8094ef hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-plus-aosp SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-plus-aosp
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-plus-aosp 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/ics-plus-aosp 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 2fad853bf7282676ee3f2ec87630de5fdbcb236b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/idea133 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/idea133
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/idea133 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/idea133 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 b568548747c9b137d7da05fcdbb84f157273b3db hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/idea133-weekly-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/idea133-weekly-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/idea133-weekly-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/idea133-weekly-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 7dd84651a25566c5a2152d935f19a11cebfc58ae hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 efd88e2c468db2169ff9bb17f2b89c246756dcda hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr0-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr0-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr0-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr0-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 7a6674d1b1c68b3919709399c5e820e501d26496 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 8bfb859e3b81a9b6448c17cfb02a0aa748580231 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-dev-plus-aosp SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-dev-plus-aosp
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-dev-plus-aosp 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-dev-plus-aosp 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 4d9f670bdbabc44c5be76b8015e795f4efe2286f hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1.1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 29a4eb7a33da12a957b3305138ada69140d8ab75 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 089d161588f07862ac1e8876a39227e4110b2bec hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-dev-plus-aosp SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-dev-plus-aosp
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-dev-plus-aosp 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-dev-plus-aosp 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 414d9e9c6928581d4f91b008c109a6a4630bfaae hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 79bf08d246aa24b5d5330630c66b71b9f2f57228 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2.0.0-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2.0.0-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2.0.0-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2.0.0-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 d1070407e28233b13ac2d04dd2c0ca58cf8f0534 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2.0-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2.0-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2.0-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2.0-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 b83c6788d63a72e1b9e059909d1235fec4f10c7c hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 67c0500290e6fe4850e23d5e3cc772a065bd698a hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-mr2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 3bf09a9f843a0ceabecbd5a2a338c36df268872a hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/jb-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 8272edba7d10b508cbbedfce5504862da6ec9acd hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-cts-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-cts-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-cts-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-cts-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 67390aad4f8a091dc14ea825ede292f8a52efb47 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-cts-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 7bb759515409f10f9674cb44589bc7bfaaf0c2a6 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 da4a6a53d48d3ba0ae0a7d6ea3cdfe2a26deb38a hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr1.1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr1.1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr1.1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr1.1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 5ffcae30c32879025de25a41a9cffc43f0033da8 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr1-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 37f06a4c87e5b0dbfda75ea76716aafadef66d32 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2.1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2.1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2.1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2.1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 dd9d9015b82bd94527c4a906e1db9ff395c86113 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2.2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2.2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2.2-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2.2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 dd9d9015b82bd94527c4a906e1db9ff395c86113 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-mr2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 dd9d9015b82bd94527c4a906e1db9ff395c86113 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 7bb759515409f10f9674cb44589bc7bfaaf0c2a6 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-wear SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-wear
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-wear 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/kitkat-wear 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 dd9d9015b82bd94527c4a906e1db9ff395c86113 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-cts-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 c58678605af608a1ef39c26453fcfbd34bab0ad4 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 795c83780752d0301985d53e2e230c2088af825b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-cts-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 a7ff2e955d2509ed28deeef984347e093794f92b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 7e21fa5ab4f867263088a38ed279d889b902a05b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-fi-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-fi-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-fi-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-fi-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 d001c5121ee0d02090537726ee848fabc6e2848f hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 a7ff2e955d2509ed28deeef984347e093794f92b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-wfc-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-wfc-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-wfc-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-mr1-wfc-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 dc3d9884d81b80e03d01cf63693325e3e2b012ec hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 c58678605af608a1ef39c26453fcfbd34bab0ad4 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-wear-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-wear-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-wear-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/lollipop-wear-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 e6af93277c5c5fe9c76af59a4b1d523143f2da93 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/l-preview SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/l-preview
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/l-preview 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/l-preview 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 2abbacb7d46657e5863eb2ef0035521ffc41a0a8 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-cts-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 f22622b2bcc1f6501fe6b7b7e2c2bcbdef2b4f55 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 3be6d0b44bf1152be0bc11bf6bacf750e1028b49 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.5-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.5-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.5-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.5-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 c123a6a9230faf4800df67085b98bcd7badf4ca8 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.5-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.5-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.5-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.5-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 9738c9f6a386eb782d1e98962c6407304eb98f33 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.6-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.6-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.6-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr1.6-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 27ef884aefb22edb2fea74aeec2ecaa34738e7b8 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 47e870adc8df32c2a6e2c531be115dd0b698850e hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-dragon-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-dragon-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-dragon-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-dragon-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 173462ba382dd1bb93766967de16a24fd02a965d hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-dr-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 310423e73156dab1c7c8f50dc67fdbc326cd37f7 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr1-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr1-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr1-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr1-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 260d90a102b3a0d7ba51c5bf73d34291ef2f4910 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 f01b4b1724fa1de06ffe8a0b45f4c629cbeb6858 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr2-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 b758515c60bb05f3087ceffe5966414ef3a653dd hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr3-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr3-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr3-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-mr3-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 354b53f9ed0d493a271bcb642ed014c456f5fb0c hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/marshmallow-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 f22622b2bcc1f6501fe6b7b7e2c2bcbdef2b4f55 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/master SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/master
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/master 2017-09-26 20:05:23.552016046 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/master 1970-01-01 09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-0000000000000000000000000000000000000000 cd959f28a0668d029ac658d566cc4f87e650c355 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
-cd959f28a0668d029ac658d566cc4f87e650c355 a37bf5616a151b08fe95a12b46e134eb96c30737 hochul 1506423923 +0900 fetch --progress aosp --tags +refs/heads/*:refs/remotes/aosp/* +refs/tags/android-6.0.1_r11:refs/tags/android-6.0.1_r11: fast-forward
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/master-soong SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/master-soong
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/master-soong 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/master-soong 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 a9657f553d2db21f99f1129cb18490d7e2497b31 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/n-iot-preview-2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/n-iot-preview-2
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/n-iot-preview-2 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/n-iot-preview-2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 a1b40f0267c0d24af33b34d578777e27c7c30611 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/n-iot-preview-4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/n-iot-preview-4
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/n-iot-preview-4 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/n-iot-preview-4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 79694e79d1368f763d2179239fa8ccf3fd13a507 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-cts-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 7de9812fd6a1d7c0fd62113d56b61260e1ab4053 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 733649c2faa96673323176db1ef0b3fc0a5a090e hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-dr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-dr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-dr1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-dr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 da8f345e55acba510eed0e30ed4cd1a316aff258 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr0.5-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr0.5-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr0.5-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr0.5-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 f04e4b7693fb08095e466bfae9ab46ccb6e20493 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 a8bcec4105010b66e81655c102904edc3ca4fbff hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.2-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 819bbf1e649c2dfe823275cf531c5b4e5aa7cb26 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.3-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.3-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.3-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.3-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 819bbf1e649c2dfe823275cf531c5b4e5aa7cb26 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.4-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.4-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.4-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.4-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 819bbf1e649c2dfe823275cf531c5b4e5aa7cb26 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.5-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.5-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.5-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.5-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 53f3b26922267865434c3a204ec24c7fc2d8bdea hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.6-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.6-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.6-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.6-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 746b4f8cb946075352308162aecb2bfd120b2061 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.7-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.7-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.7-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1.7-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 bd3c8ed4373450fdfd98542726b8c2603dfb7692 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-cts-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 819bbf1e649c2dfe823275cf531c5b4e5aa7cb26 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 378dec149569f57a4f8bfcbf5ece3fd458ab6263 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-flounder-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-flounder-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-flounder-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-flounder-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 f4565c8de097a516cbdeda61909e19abc42bab1b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 819bbf1e649c2dfe823275cf531c5b4e5aa7cb26 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-volantis-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-volantis-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-volantis-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-volantis-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 819bbf1e649c2dfe823275cf531c5b4e5aa7cb26 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-wear-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-wear-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-wear-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr1-wear-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 a1b40f0267c0d24af33b34d578777e27c7c30611 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.1-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 73d0b408487f43b67b2b4369d809affe3bb6eed6 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.2-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 11507add1b55931199c4726bb9bb98078b178cab hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.3-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.3-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.3-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2.3-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 6b20d59132cf7a7ff8697dbdd261dc0fe0858608 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 9ac842a753ebd0b228fe31a81671ff60c23fe1e7 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-pixel-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-pixel-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-pixel-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-pixel-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 bd1cc323b4a743dcf1cefa87158dbd7aa9383ad0 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-mr2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 179f0e9512100b0a403aab8b2b4cf5510bb20bee hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/nougat-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 566da28d087bb560b9a676a48ee080e703f1afbf hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/o-iot-preview-5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/o-iot-preview-5
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/o-iot-preview-5 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/o-iot-preview-5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 5a652c028696c526898d82eb4d549351ec29afa4 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/o-preview SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/o-preview
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/o-preview 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/o-preview 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 084c20409b94ebbe2465e66d03290d9003c7a8b1 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-cts-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 8b466aa767fb2b874375a2724fcdc7b10a26b3d4 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-dev 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 6b1ff7073a370352f76e98938349ca95b84931bf hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r3-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r3-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r3-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r3-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 da7c2229720cfeb3945ba625a494cf1a497313ec hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r4-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r4-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r4-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r4-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 59986530a5511713ebed4e1a08fcfd6602debf7b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r6-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r6-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r6-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-r6-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 b9a7b6a2b187e54ff22e8f6d7b6addab72eb5c05 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/oreo-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 59986530a5511713ebed4e1a08fcfd6602debf7b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/sdk-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/sdk-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/sdk-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/sdk-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 ab9e269d068bd9c10b5501f26230214ae673c3cd hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r20 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r20
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r20 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r20 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 60ec22d1bdaa6124311a720717e3c522f839441e hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r21 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r21
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r21 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r21 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 78f5c4d5372e38b5a5d1e2f3e3b732951a76f007 hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r22 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r22
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r22 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r22 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 3c10f535786bf4676664b937b617ec891b0ee25b hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r22.2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r22.2
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r22.2 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/aosp/tools_r22.2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 1faefa06a3a742123af8ea5be5bbfb730db16c7c hochul 1506423920 +0900 fetch --progress /home/jake/Android_6.0.1_r11/.repo/projects/packages/apps/Settings.git/clone.bundle +refs/heads/*:refs/remotes/aosp/* refs/tags/*:refs/tags/*: storing head
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/m/android-6.0.1_r11 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/m/android-6.0.1_r11
--- Android_6.0.1_r11/packages/apps/Settings/.git/logs/refs/remotes/m/android-6.0.1_r11 2017-09-26 20:05:23.572016046 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/logs/refs/remotes/m/android-6.0.1_r11 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 1cc945c6b06c7a0a3a22212e299e3abd45aab029 Hochul Lee 1506423923 +0900 manifest set to refs/tags/android-6.0.1_r11
Binary files Android_6.0.1_r11/packages/apps/Settings/.git/objects/11/8ec237624991988830ade0ea200147a85e7e6c and SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/objects/11/8ec237624991988830ade0ea200147a85e7e6c differ
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/objects/6b/e287a2092d5b786c96c6af8a1e5f7bfe8b2798 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/objects/6b/e287a2092d5b786c96c6af8a1e5f7bfe8b2798
--- Android_6.0.1_r11/packages/apps/Settings/.git/objects/6b/e287a2092d5b786c96c6af8a1e5f7bfe8b2798 2017-09-26 20:05:23.516016047 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/objects/6b/e287a2092d5b786c96c6af8a1e5f7bfe8b2798 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-xKn0 D)xl(UE/ QtĶYWE{f7%U|7Z gK`UdH#BkNQZϵKQ+ֈhUqb~S.psZT+|k,9
ZJgYSad-A+!m/O\WS(mg6h*Di\ Ϝh ۔9+bu:?!8"'v
oB>iGXN9 uxsDBR )yo8cVYξ-z
\ No newline at end of file
Binary files Android_6.0.1_r11/packages/apps/Settings/.git/objects/a3/7bf5616a151b08fe95a12b46e134eb96c30737 and SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/objects/a3/7bf5616a151b08fe95a12b46e134eb96c30737 differ
Binary files Android_6.0.1_r11/packages/apps/Settings/.git/objects/ca/fe3bffa26e7e47e97a4fbb2567b022a0aba2a0 and SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/objects/ca/fe3bffa26e7e47e97a4fbb2567b022a0aba2a0 differ
Binary files Android_6.0.1_r11/packages/apps/Settings/.git/objects/pack/pack-c359d2f3c562ca47ee45342536c926d535a0383d.idx and SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/objects/pack/pack-c359d2f3c562ca47ee45342536c926d535a0383d.idx differ
Binary files Android_6.0.1_r11/packages/apps/Settings/.git/objects/pack/pack-c359d2f3c562ca47ee45342536c926d535a0383d.pack and SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/objects/pack/pack-c359d2f3c562ca47ee45342536c926d535a0383d.pack differ
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/donut-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/donut-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/donut-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/donut-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7247d75a741609bcf498d24073260cf24ab9b08c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/donut-release2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/donut-release2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/donut-release2 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/donut-release2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-64b691a8abb2bbb2952cb44a7dc04f153d717bc3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/eclair-passion-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/eclair-passion-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/eclair-passion-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/eclair-passion-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ad76f17a1c75447047fc2791b65e93341925998b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/eclair-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/eclair-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/eclair-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/eclair-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ad76f17a1c75447047fc2791b65e93341925998b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/eclair-sholes-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/eclair-sholes-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/eclair-sholes-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/eclair-sholes-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-18517f50edcfebf41b61965b24e360858db1c5e4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/eclair-sholes-release2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/eclair-sholes-release2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/eclair-sholes-release2 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/eclair-sholes-release2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ad76f17a1c75447047fc2791b65e93341925998b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/froyo SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/froyo
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/froyo 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/froyo 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f4d359d3c83d0e84319603ecc0f4dce120708612
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/froyo-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/froyo-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/froyo-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/froyo-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-50c529220a8af165df92f4aa6a52c3eec60282ee
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9cb97c44eefff70fd0fc1c1b8dd7ba87f15ba9e6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread-mr4-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread-mr4-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread-mr4-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread-mr4-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a36690ebff7be78d31676db721667314f72af0aa
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/gingerbread-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-935b504a05f328cf90db3415b82ff4a7f51e628f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-factoryrom-2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-factoryrom-2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-factoryrom-2-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-factoryrom-2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-850cb95af3949ca7967deea104844c800f7d4b62
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr0 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr0
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr0 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr0 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-fec195d7564b489fcdd814d066cfbf6af702132b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr0-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr0-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr0-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr0-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-009c1cc19e4254a4a6c923a981ea671d458317c5
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1e2ba6221775d491ff9e895cddf823b492b4768e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr1-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-815b2f3467aa1d1e98be7a0e2e8e5a6a8c8094ef
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-plus-aosp SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-plus-aosp
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/ics-plus-aosp 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/ics-plus-aosp 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2fad853bf7282676ee3f2ec87630de5fdbcb236b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/idea133 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/idea133
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/idea133 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/idea133 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b568548747c9b137d7da05fcdbb84f157273b3db
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/idea133-weekly-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/idea133-weekly-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/idea133-weekly-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/idea133-weekly-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7dd84651a25566c5a2152d935f19a11cebfc58ae
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-efd88e2c468db2169ff9bb17f2b89c246756dcda
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr0-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr0-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr0-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr0-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7a6674d1b1c68b3919709399c5e820e501d26496
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8bfb859e3b81a9b6448c17cfb02a0aa748580231
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-dev-plus-aosp SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-dev-plus-aosp
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-dev-plus-aosp 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-dev-plus-aosp 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4d9f670bdbabc44c5be76b8015e795f4efe2286f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1.1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-29a4eb7a33da12a957b3305138ada69140d8ab75
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-089d161588f07862ac1e8876a39227e4110b2bec
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-dev-plus-aosp SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-dev-plus-aosp
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-dev-plus-aosp 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-dev-plus-aosp 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-414d9e9c6928581d4f91b008c109a6a4630bfaae
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-79bf08d246aa24b5d5330630c66b71b9f2f57228
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2.0.0-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2.0.0-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2.0.0-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2.0.0-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d1070407e28233b13ac2d04dd2c0ca58cf8f0534
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2.0-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2.0-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2.0-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2.0-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b83c6788d63a72e1b9e059909d1235fec4f10c7c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-67c0500290e6fe4850e23d5e3cc772a065bd698a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-mr2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3bf09a9f843a0ceabecbd5a2a338c36df268872a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/jb-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/jb-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8272edba7d10b508cbbedfce5504862da6ec9acd
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-cts-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-cts-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-cts-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-cts-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-67390aad4f8a091dc14ea825ede292f8a52efb47
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-cts-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7bb759515409f10f9674cb44589bc7bfaaf0c2a6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-dev 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-da4a6a53d48d3ba0ae0a7d6ea3cdfe2a26deb38a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr1.1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr1.1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr1.1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr1.1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-5ffcae30c32879025de25a41a9cffc43f0033da8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr1-release 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-37f06a4c87e5b0dbfda75ea76716aafadef66d32
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2.1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2.1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2.1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2.1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-dd9d9015b82bd94527c4a906e1db9ff395c86113
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2.2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2.2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2.2-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2.2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-dd9d9015b82bd94527c4a906e1db9ff395c86113
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-mr2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-dd9d9015b82bd94527c4a906e1db9ff395c86113
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7bb759515409f10f9674cb44589bc7bfaaf0c2a6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-wear SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-wear
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-wear 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/kitkat-wear 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-dd9d9015b82bd94527c4a906e1db9ff395c86113
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-cts-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c58678605af608a1ef39c26453fcfbd34bab0ad4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-795c83780752d0301985d53e2e230c2088af825b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-cts-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a7ff2e955d2509ed28deeef984347e093794f92b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7e21fa5ab4f867263088a38ed279d889b902a05b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-fi-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-fi-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-fi-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-fi-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d001c5121ee0d02090537726ee848fabc6e2848f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a7ff2e955d2509ed28deeef984347e093794f92b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-wfc-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-wfc-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-wfc-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-mr1-wfc-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-dc3d9884d81b80e03d01cf63693325e3e2b012ec
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c58678605af608a1ef39c26453fcfbd34bab0ad4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-wear-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-wear-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-wear-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/lollipop-wear-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e6af93277c5c5fe9c76af59a4b1d523143f2da93
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/l-preview SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/l-preview
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/l-preview 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/l-preview 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2abbacb7d46657e5863eb2ef0035521ffc41a0a8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-cts-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f22622b2bcc1f6501fe6b7b7e2c2bcbdef2b4f55
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3be6d0b44bf1152be0bc11bf6bacf750e1028b49
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.5-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.5-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.5-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.5-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c123a6a9230faf4800df67085b98bcd7badf4ca8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.5-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.5-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.5-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.5-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9738c9f6a386eb782d1e98962c6407304eb98f33
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.6-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.6-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.6-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr1.6-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-27ef884aefb22edb2fea74aeec2ecaa34738e7b8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-47e870adc8df32c2a6e2c531be115dd0b698850e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-dragon-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-dragon-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-dragon-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-dragon-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-173462ba382dd1bb93766967de16a24fd02a965d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-dr-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-310423e73156dab1c7c8f50dc67fdbc326cd37f7
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr1-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr1-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr1-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr1-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-260d90a102b3a0d7ba51c5bf73d34291ef2f4910
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f01b4b1724fa1de06ffe8a0b45f4c629cbeb6858
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr2-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b758515c60bb05f3087ceffe5966414ef3a653dd
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr3-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr3-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr3-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-mr3-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-354b53f9ed0d493a271bcb642ed014c456f5fb0c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/marshmallow-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f22622b2bcc1f6501fe6b7b7e2c2bcbdef2b4f55
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/master SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/master
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/master 2017-09-26 20:05:23.552016046 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/master 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a37bf5616a151b08fe95a12b46e134eb96c30737
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/master-soong SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/master-soong
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/master-soong 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/master-soong 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a9657f553d2db21f99f1129cb18490d7e2497b31
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/n-iot-preview-2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/n-iot-preview-2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/n-iot-preview-2 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/n-iot-preview-2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a1b40f0267c0d24af33b34d578777e27c7c30611
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/n-iot-preview-4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/n-iot-preview-4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/n-iot-preview-4 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/n-iot-preview-4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-79694e79d1368f763d2179239fa8ccf3fd13a507
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-cts-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7de9812fd6a1d7c0fd62113d56b61260e1ab4053
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-733649c2faa96673323176db1ef0b3fc0a5a090e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-dr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-dr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-dr1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-dr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-da8f345e55acba510eed0e30ed4cd1a316aff258
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr0.5-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr0.5-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr0.5-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr0.5-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f04e4b7693fb08095e466bfae9ab46ccb6e20493
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a8bcec4105010b66e81655c102904edc3ca4fbff
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.2-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-819bbf1e649c2dfe823275cf531c5b4e5aa7cb26
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.3-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.3-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.3-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.3-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-819bbf1e649c2dfe823275cf531c5b4e5aa7cb26
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.4-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.4-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.4-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.4-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-819bbf1e649c2dfe823275cf531c5b4e5aa7cb26
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.5-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.5-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.5-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.5-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-53f3b26922267865434c3a204ec24c7fc2d8bdea
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.6-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.6-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.6-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.6-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-746b4f8cb946075352308162aecb2bfd120b2061
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.7-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.7-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.7-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1.7-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-bd3c8ed4373450fdfd98542726b8c2603dfb7692
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-cts-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-819bbf1e649c2dfe823275cf531c5b4e5aa7cb26
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-378dec149569f57a4f8bfcbf5ece3fd458ab6263
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-flounder-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-flounder-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-flounder-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-flounder-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f4565c8de097a516cbdeda61909e19abc42bab1b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-819bbf1e649c2dfe823275cf531c5b4e5aa7cb26
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-volantis-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-volantis-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-volantis-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-volantis-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-819bbf1e649c2dfe823275cf531c5b4e5aa7cb26
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-wear-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-wear-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-wear-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr1-wear-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a1b40f0267c0d24af33b34d578777e27c7c30611
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.1-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.1-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.1-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.1-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-73d0b408487f43b67b2b4369d809affe3bb6eed6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.2-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-11507add1b55931199c4726bb9bb98078b178cab
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.3-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.3-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.3-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2.3-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6b20d59132cf7a7ff8697dbdd261dc0fe0858608
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-dev 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9ac842a753ebd0b228fe31a81671ff60c23fe1e7
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-pixel-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-pixel-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-pixel-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-pixel-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-bd1cc323b4a743dcf1cefa87158dbd7aa9383ad0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-release 2017-09-26 20:05:20.692016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-mr2-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-179f0e9512100b0a403aab8b2b4cf5510bb20bee
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/nougat-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/nougat-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-566da28d087bb560b9a676a48ee080e703f1afbf
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/o-iot-preview-5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/o-iot-preview-5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/o-iot-preview-5 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/o-iot-preview-5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-5a652c028696c526898d82eb4d549351ec29afa4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/o-preview SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/o-preview
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/o-preview 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/o-preview 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-084c20409b94ebbe2465e66d03290d9003c7a8b1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-cts-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-cts-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-cts-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-cts-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8b466aa767fb2b874375a2724fcdc7b10a26b3d4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-dev SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-dev
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-dev 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-dev 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6b1ff7073a370352f76e98938349ca95b84931bf
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r3-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r3-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r3-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r3-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-da7c2229720cfeb3945ba625a494cf1a497313ec
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r4-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r4-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r4-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r4-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-59986530a5511713ebed4e1a08fcfd6602debf7b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r6-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r6-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r6-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-r6-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b9a7b6a2b187e54ff22e8f6d7b6addab72eb5c05
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/oreo-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/oreo-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-59986530a5511713ebed4e1a08fcfd6602debf7b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/sdk-release SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/sdk-release
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/sdk-release 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/sdk-release 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ab9e269d068bd9c10b5501f26230214ae673c3cd
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/tools_r20 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/tools_r20
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/tools_r20 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/tools_r20 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-60ec22d1bdaa6124311a720717e3c522f839441e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/tools_r21 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/tools_r21
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/tools_r21 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/tools_r21 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-78f5c4d5372e38b5a5d1e2f3e3b732951a76f007
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/tools_r22 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/tools_r22
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/tools_r22 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/tools_r22 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3c10f535786bf4676664b937b617ec891b0ee25b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/tools_r22.2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/tools_r22.2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/aosp/tools_r22.2 2017-09-26 20:05:20.688016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/aosp/tools_r22.2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1faefa06a3a742123af8ea5be5bbfb730db16c7c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/m/android-6.0.1_r11 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/m/android-6.0.1_r11
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/remotes/m/android-6.0.1_r11 2017-09-26 20:05:23.572016046 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/remotes/m/android-6.0.1_r11 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ref: refs/tags/android-6.0.1_r11
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ec88f26d6942bdece9395f73a0bdea7650d2bfd7
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1.1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-83794b43df66b563d247cee72e523f5a5fefa396
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1.2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1.2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1.2 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1.2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3dc8f924a5cbb99d9c08118a2ab5c982e2765769
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1.3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1.3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1.3 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1.3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6f31a9b12c99e323851eb8f3f7cd3d5cb026cdc8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1.4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1.4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1.4 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1.4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-455f2a7d633b2d05efd5e13ee4d7dfc8288d3347
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1.5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1.5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r1.5 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r1.5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-88decbd1022c47f509e92a6f45aafb10d10cb0a7
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-1.6_r2 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-1.6_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d5bc1a883ec45244d0386dadc018daf584045a30
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.0.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.0.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.0.1_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.0.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-599ad9fd4c9b5da52276dcaf4f1fd5b9687b5762
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.0_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c2e69e5bd7747266e37b7bf553e04cf219331470
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.1_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2d4e5bebfe3e72136f7c1b5fc3bb4857efcb4311
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.1_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.1_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.1_r2 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.1_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ead6e8a8d4065a89e78a6a9850e07d8cb5294fec
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1p SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1p
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1p 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1p 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-218235689ca9412820198f178397f405ff18d7ba
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1p2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1p2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1p2 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1p2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e0725838015c2f4577f33b9a02dda056d84515d0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1s SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1s
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1s 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.1_r2.1s 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-114a6bb5eaa3b3839e59528dab854442a236e7ce
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.1_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8455cdbed79810a3b224b126ccb43ee1f6e13ceb
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.1_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.1_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.1_r2 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.1_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-535448e4a97cae3d32f36955de1ab386d07b619f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.2_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c0f1b5f31141f73d47589f08ccd3c19340aaaac6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.3_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.3_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.3_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.3_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b788d307727ae7359d7f8523d913c4ca7efb440a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.3_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.3_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.3_r2 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.3_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-104a69ee2c218a671181a9bfd2404e503a91aa3e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.3_r2.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.3_r2.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2.3_r2.1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2.3_r2.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d02e94df75067050750187335dd1fbc521af12c3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-5071f4f598aa456f9b9a3d6820d71ee1014be9d6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2_r1.1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1b7a4f942a87cddd9a8784bb54c6d73d173387cb
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2_r1.2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2_r1.2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2_r1.2 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2_r1.2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-59f4bc7da3b312378c94d7f1c4482f00951d0a5d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2_r1.3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2_r1.3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.2_r1.3 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.2_r1.3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8d6714acdf7346b500894bdf9828ad4f55df443a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.1_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6ef904fb6069f9ed510e6a969270f6abd80858e6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.2_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9f3cb428c574cacacb8a91abed8548d573abb06b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.3_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.3_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.3_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.3_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-aa2b1518eb26d81aa4120f2830649cd616734cb8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.3_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.3_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.3_r1.1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.3_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d8759539074eef8993c1df340204babf151a5a56
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.4_r0.9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.4_r0.9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.4_r0.9 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.4_r0.9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4f5f8e6b95c98f4901114f23f50dcaefae6465ca
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.4_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.4_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.4_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.4_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-897066a85c4acb57b00175affb01f89fa9e8f4e3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.5_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.5_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.5_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.5_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e67656c1df0cc8676e05bca4dfb6b90b9fd2990b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.6_r0.9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.6_r0.9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.6_r0.9 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.6_r0.9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7e13df23edf049244ab883ba914c4c716eb4e0ea
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.6_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.6_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.6_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.6_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4c568da55f74d1aee61a2952477b0443aeea6696
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.7_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.7_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3.7_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3.7_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-567b0cce9a5dcb0f2a7c6bad76fb1a8388a1e558
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-2.3_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-2.3_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4c54e0a3779b0aaa62de0e53f51466f4c6f9eb87
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-322f492f154551ef22e923de611104d379b1662a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1.1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a2cbc60c2ed2083fa140c6dca862f3327fb71e32
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1.2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1.2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1.2 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.1_r1.2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b132435648dc87c8840f21e1de690d361b68c683
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.2_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-37e62f2637720c7b808981af0ad3279cd1ac39ca
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.3_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.3_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.3_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.3_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7b3ff3e77c2c5ef8bef0c51c210a97846d2ec04e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.3_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.3_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.3_r1.1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.3_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0095682292d91439295189bb793cee8768bf521a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7fdc5f7d88bc636bedd56aed64bbbc20f6477e77
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1.1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-cace84148e750d183bbd3899ebe6764c93374a7a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1.2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1.2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1.2 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.4_r1.2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2b98ce5d96a392f666b834e5bba55aeae11a7bb4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.4_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.4_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.4_r2 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.4_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4a901693ceafdf197a245b78b3c2e6d768e7e094
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.4_r2.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.4_r2.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.0.4_r2.1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.0.4_r2.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a6225837459834cb86362454e0c15dc426aea169
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-044664db7b6ea177fd1f25187d5ec2419e5d0e35
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r1.1 2017-09-26 20:05:20.724016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2a7597fa9bdce6bc7944122ff00ad412b5883e9c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r2 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b23dc713da64e5e8e31df4fc042645a807eed2a0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r3 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-87328e7f4f8b6f314949cd128a13db01cd95df01
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r4 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-721ef6e6f39f9d94eaf70e812c9780162c05ad13
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r5 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f535b4132e8c2d44c7a18f4b2a4790daf75a3344
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r6 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9879c56dec60043e2c6450370568a6dcdacc67d9
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r6.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r6.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.1_r6.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.1_r6.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a7a5c353f46ef9d5311a5971c5e050d03d04cdd9
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.2_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-5e6d6db0eb1dca6d8049f374889dd2384c568430
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.2_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.2_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.2_r2 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.2_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3a7e1fa43a27ea6e79dc9e1480fd52bcaf11a959
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.2_r2.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.2_r2.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.1.2_r2.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.1.2_r2.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-555b9d409302224a777e18913be3a9c06cd43738
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1a2fefd66ee29e469f5795b0bca129f9b56021dd
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-487898dba7e7b7eae76fdc49cefa672dd15462cf
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1.2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1.2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1.2 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.1_r1.2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e8d35a0597227a42987f9d80c1365d1c5ec597cf
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-efa17f9ff14af2da5bf3245e3a38333f3e08ac52
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8eeca2f5c257cfdaff17b097c6f02c68dc3fb535
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1.2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1.2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1.2 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2.2_r1.2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a326cb7420db5d1111a2d9a636e24bc307c8c81d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.2_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6a5deb41e1aa5fd6199ab654bf436d0d84a4dde3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3.1_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8ccbfed5ab8e5957bc179cc3fed440cdd3c00eff
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r0.9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r0.9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r0.9 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r0.9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-fc8a043aca0694205ac2a1a6b7b898509a6d1226
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r0.9.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r0.9.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r0.9.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r0.9.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-86900cabbc584883a248271120a64d70b6b2d64d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-36c1fd64c3c0d135c26d28cb1c99fdabbb77179e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r1.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-15840dab5aa78731e971424c120c1d613725e227
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r2 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-62c993b74fbacf4ac0a707253fd122ed179c7d99
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r2.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r2.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r2.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r2.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-af15aaea7ac6848942a582d0ef4419bb3da58a81
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r2.2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r2.2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r2.2 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r2.2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c9767044aa303d321339dc4240da1fd3b20e39db
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r2.3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r2.3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r2.3 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r2.3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f52c8ab595d041b529085c260b08571d169a8103
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r2.3_ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r2.3_
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r2.3_ 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r2.3_ 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a715887a2067e9d9c666804c5d22cbf57d36782e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r3 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6ff3e06dca6b094b2cbe19108f6d277a77161219
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r3.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r3.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.3_r3.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.3_r3.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-39db0decedf86dee5c8a4c599bee1dacb9dbd361
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.1_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6eec4f392c8e53dcf6ec7743de2ed606e3e19e8a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.1_r1.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.1_r1.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.1_r1.0.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.1_r1.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-84c3dd434496f0b5a2b30332376e2534ca6643d4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.2_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-886c0c85904a981b704e6a9ddf9a8dab02ca3f1a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.2_r1.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.2_r1.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.2_r1.0.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.2_r1.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-41a1bef38c27935d251952d0eb26c4ae771d0ea8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.2_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.2_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.2_r2 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.2_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-db485c2058c140f35ba8ae403e7293bd1d84645a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.2_r2.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.2_r2.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.2_r2.0.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.2_r2.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1bb194b819ed8e6ca5c02ccc4ab5cb7e12af91d2
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7920f31555ea19355f4179caf6c2b70d01383e71
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.0.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0fabafd3cc53d251f84a1c371b3f2951c75ba166
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2fc912b9235b21ea9b7232de991cc0cc3d181da0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.1.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.1.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.1.0.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.3_r1.1.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0513fe90b23483fb66325bad55c7b01c0f7c4f8e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.4_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.4_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.4_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.4_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a74ae72e5edfa96e98f2644bbc9674b0f928ac36
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.4_r1.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.4_r1.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.4_r1.0.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.4_r1.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-032af13e1d44ea815b7afcf383fbcbe16d70ed3f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.4_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.4_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.4_r2 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.4_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b36deceb916cbc7f0e352930aefef1f9152b81b8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.4_r2.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.4_r2.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4.4_r2.0.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4.4_r2.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2f8949a5fa9b1c3ff419211d043b861dca42e3ec
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r0.7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r0.7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r0.7 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r0.7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-76f6b7b9efb283cf4342960e3a9474c4d0d7e911
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r0.8 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r0.8
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r0.8 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r0.8 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e0eff3fdca6244d3628846bfdfb355ff4436b595
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r0.9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r0.9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r0.9 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r0.9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-de8ea900b476c0d2201efffed7db3e903308b062
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9550758a8628365d1fdba940ada777ec9f48d6f6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1.0.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7bf9fb290df97ad122f49ba26766bbe669f2222a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-69bdbb1cd2be6f05cc8a8112bc22e98e65d1812f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1.1.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1.1.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1.1.0.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1.1.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-306aeb82a9cc7b3e914ed981d3b1d8c31f6b28b8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1.2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1.2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1.2 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1.2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6e819f6b98017d27651b127562dc2d43671817d3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1.2.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1.2.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4_r1.2.0.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4_r1.2.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-37949c26cfb57af8c8309207c36a2f202ae10229
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4w_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4w_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-4.4w_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-4.4w_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ad3413f956d82b5794870bc005dce71deb67f0e0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-49bd51c1b6838ed53d332130216a25c6a06584b1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r2 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-35e13de991feb0995634b2be06d3c49ec6f32270
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r3 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3a6cefc40260f8b1de3e92a206e0407282459063
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r4 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1765b66038a359a6867ddf6fa512298babe1057c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r5 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9a827c59fbe6c1099ecb32456b43786336d4afb1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r5.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r5.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r5.1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r5.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-753c7903e2c775b1e2184f0751102ba966bd867b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r6 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0c22c19a43757afade9a50ff5d465609419272f8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.0_r7 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.0_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e87fc0abbfb6511094ddb9bee6b0b8729afd9ea6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.1_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b90e8c9ad1088d9c2ac54ee885d285ad510ff060
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.2_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-16f032422bfbb5e17e2a5c6e01cff01c30eb406f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.2_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.2_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.0.2_r3 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.0.2_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0cd5412988b9caf17b91b12ef90e55b40c77ad6c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.0_r1 2017-09-26 20:05:20.720016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-19d0d1b4473763e72b0f72400b767b0cce86f020
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.0_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.0_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.0_r3 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.0_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3249d5baa27bf74c0d6b450d7fac86c15c0b3223
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.0_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.0_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.0_r4 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.0_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a45e15a604a5faaf42e0c9e09983181d3f82f545
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.0_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.0_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.0_r5 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.0_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-927d3ee7f47e4a56c93363ee36f91ceb2eac8ac8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r1 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ae88c4f77a9e68fdbb74aaa19619a86ef4d39c75
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r10 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r10
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r10 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r10 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-265872b173c58c9945c3b66597b0449b677efa43
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r12 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r12
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r12 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r12 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f2d4e66fdbdf452a966472aa5203b6c3be52f4fe
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r13 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r13
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r13 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r13 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-402797341542054a21d9a5788dfe563240896f72
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r14 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r14
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r14 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r14 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-77fe463bdcdd28119b947c6579c1549f0966a62e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r15 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r15
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r15 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r15 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-78fc392cb1b1e055b3d85f5cfecfb249a0629b83
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r16 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r16
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r16 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r16 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c7e4fa301ebdba9497bc3b116d048c9e6a8dc0ce
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r17 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r17
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r17 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r17 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-24b96f4b6758d9108d130c5ac9706d4c06b390b1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r18 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r18
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r18 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r18 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7ead1740168e8a96eca502c212a514285ec9894e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r19 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r19
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r19 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r19 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8647fd5a255002cc0fc889705ee7dc4ed7baa9e6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r2 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e4b7c398fa839dce44dc40e8fb67c4e5023b812c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r20 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r20
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r20 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r20 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8d61b200e890b7b417e3d8fc3319ddbfdfc0421f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r22 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r22
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r22 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r22 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4844489867b96ec053a111e671002dd9b4eee4c0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r23 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r23
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r23 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r23 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-053b7049ba12b63e84f03f05ab9a38ecf3ab005f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r24 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r24
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r24 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r24 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-af6f63a97535cf5c53424bf4d4209120d9194f8a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r25 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r25
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r25 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r25 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8f462c0e9cbccbd3b8d955e075ce2fa48807d881
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r26 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r26
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r26 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r26 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-bc784ab8f564f4a1647047bb82771425ef63be2f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r28 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r28
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r28 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r28 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-56f755dee6b684c0ea29fedcf86d3d090ab9f504
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r29 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r29
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r29 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r29 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0f12ff89c5ba38a44e81c0d723e1fa54634ea37c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r3 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8306ed334b0aa1f351190ae3aabab400c4618fdb
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r30 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r30
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r30 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r30 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2398a2fb671670262083a0dd94c6a1ef0bb729c5
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r33 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r33
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r33 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r33 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-549844767cda5e6554c1f4b5cbba0bce7409b46e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r34 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r34
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r34 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r34 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b6b3877f3aea04b3d3edd2b5dc9b543ae1901de3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r35 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r35
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r35 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r35 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-240e11914590c0fc9a4a2e3539a605622c3e7b36
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r36 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r36
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r36 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r36 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-afaf34b280cfc905897c798bac532be1f8b9d531
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r37 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r37
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r37 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r37 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-eccfd043d41595dc8b0518dc780779e6efce43a5
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r38 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r38
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r38 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r38 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-14f7ed1e4c5170c8fae9ab4a08962c61fe30ad66
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r4 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-cf539191820b101bb6ac3cacd57936bdf2aedf62
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r5 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6d3f3a10741dad65ee93dbb52cfaa9028229a1f9
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r6 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4df3a9d2e2c84c7345ddc7225113358e053fd057
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r7 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b8180754707c8ae70937637af00df3a9f0d60925
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r8 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r8
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r8 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r8 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a52fe88102583f18c913b14a645b4aefc9f5da9e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-5.1.1_r9 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-5.1.1_r9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f878ed76fa747aed70f7dd019852de3ab0431bef
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r1 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-57c6a485aa2b5d78a16efbc76f4dfa6a862ee789
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r11 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r11
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r11 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r11 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c4228f9753380b643c9efedfb355d0f66c9858f4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r12 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r12
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r12 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r12 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-fd2a16983c460e40147d3ff970d2dfb68bc9d27d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r13 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r13
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r13 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r13 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9a8910eba1c40f010210d6325a6128015ee4bfc2
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r2 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e7c3ee6177030e0bd552a1894b49af5b19985361
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r23 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r23
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r23 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r23 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ac7ea1e14d7aa2e98e36f72bf16b766fbb291be2
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r24 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r24
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r24 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r24 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d17dcac911d50789a72c4a04c4a53623e0a0d933
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r25 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r25
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r25 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r25 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-59ea58da63dd9730a4f51aba9c9a826900149ed6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r26 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r26
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r26 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r26 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a0ad4f11ec350749e72b20310cc62b8ccd0a4e23
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r3 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-40bde422400087939de4fbeb3951feba892e6ea3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r4 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f78b595c6876e51b71de96b3bd97f8eadfcfab44
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r41 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r41
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r41 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r41 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f28f14208897b31684c05ad18f7a17adcca167fa
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r5 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-dff0f40ca31331b124cf831b7717d0e42138fe75
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r6 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-848c840882dded903b794e33d259f436a9cfbe0f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.0_r7 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.0_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-133d7c34ca04bc245f125e52db5d5f52d540ecde
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r1 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2912c312172c9195388501653cb44a4ab4a22100
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r10 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r10
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r10 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r10 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-427dc882f0f6b6078714be6eecea12a3706f22c2
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r11 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r11
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r11 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r11 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1cc945c6b06c7a0a3a22212e299e3abd45aab029
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r12 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r12
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r12 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r12 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-cd2031c0caf6cb89eb0090fd6cce72afb4f927b7
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r13 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r13
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r13 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r13 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-dd3690c436381cf0b0c30bc4d6b6626a20809a10
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r16 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r16
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r16 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r16 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-28a61728cf60a19567a43f5f9f47f171cf1b1e1c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r17 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r17
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r17 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r17 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-65209de93a2dd4403d0713f662d5b5f5e91aa58e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r18 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r18
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r18 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r18 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-101f965a415be077df4122100e78da347a6e791b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r20 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r20
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r20 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r20 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3678e753e6c2b219bc1af294fcbab51ccc98fb00
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r21 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r21
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r21 2017-09-26 20:05:20.716016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r21 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-71b45b24aef77b57fa93b23f037840851015dd90
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r22 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r22
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r22 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r22 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-af9229d8a4d39e6daba69ce62803fac4901923e6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r24 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r24
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r24 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r24 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-bcaf6b97c44c7b852011b56f4223aacd575526ec
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r25 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r25
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r25 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r25 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-903829479a94aff837c1bc516b3dd217e3106318
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r26 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r26
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r26 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r26 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-924bb47bd39aa63451ad55cd91592b6fc9ca2e34
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r27 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r27
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r27 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r27 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-673cac815325de2afd2cb1d8b2b7b28f166fc03c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r28 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r28
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r28 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r28 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-fb6e83ba3be79501abd1822a2875f8630253e2d3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r3 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-25be4d862e8c083cfdec4403186265c2d65ec3ec
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r30 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r30
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r30 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r30 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-62105bbdb7cfc1e455f8e681d23c208b5980cbe1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r31 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r31
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r31 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r31 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-fe38e1abd56e8f167952539c2a2f2fedbbcc6f33
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r32 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r32
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r32 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r32 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-78ede6c921cd65e5392640bb191b7a3ae44a9029
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r33 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r33
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r33 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r33 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-5f6b8875d9a5a0c05062006c7e3655ab0e005f63
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r4 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2e6bda45dc5b08be31308a8251472594eac9538a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r40 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r40
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r40 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r40 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1423ff0e35b9e68493ceb899d66561283ac8cb7b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r41 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r41
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r41 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r41 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-bc888a32e1b354390aa0ace9bf1a7e840bad09e1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r42 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r42
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r42 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r42 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b1334304fbde2f794c8bb83ef833281066731b45
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r43 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r43
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r43 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r43 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3135b835e012c9f2346fe91a823ec38dd45cabd3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r45 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r45
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r45 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r45 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a28f4e2b14199cad50aa09e52edd6ca2668a0587
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r46 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r46
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r46 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r46 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8273a2471ef4d2e77426995ebebe6fd5481b09e3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r47 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r47
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r47 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r47 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e578734ac5251a3db8c756d4cbf94e7ce6703d71
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r48 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r48
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r48 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r48 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-55067e171a28fe079a53458561bc81335345b66f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r49 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r49
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r49 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r49 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a782020809c7e8352d3ca414bca272d70c6d5cbe
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r5 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-39093334452338dd6822404060a9e6d8ea621252
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r50 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r50
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r50 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r50 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-fe1cf364e452b0d8531765a7974275c11f13bf74
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r51 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r51
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r51 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r51 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f6c7734bab80ff5395f32628a817aadf15707483
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r52 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r52
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r52 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r52 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8100551e93474d04a2b03e70b8e89f5db354fadf
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r53 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r53
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r53 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r53 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8254c51566f6aa4ebc63107809df48d361f62491
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r54 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r54
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r54 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r54 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-54fb08e86dcac800e39977e22f7d4258b69c86da
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r55 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r55
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r55 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r55 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-06179041bc2a10dd2e48f074eee37afd0eaee394
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r56 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r56
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r56 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r56 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1ddd6431664b65ef75e97d80407ff15ecc4c8e52
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r57 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r57
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r57 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r57 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-649f77c32d3be275aad507437e2fb2508863ec00
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r58 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r58
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r58 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r58 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-654132e4a03809adffa196669da84b498d0404b3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r59 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r59
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r59 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r59 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d7c069a34176a88df685460f15d7b9562bbfdbd1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r60 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r60
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r60 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r60 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1b28412bfca6e2da97866e6657581b0d29e1c0f4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r61 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r61
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r61 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r61 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-534a96354783c0a31fb3911cae20e0a1663d8eb3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r62 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r62
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r62 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r62 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-86f530ab906f6d72c7a06e44775785e65bce8107
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r63 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r63
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r63 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r63 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-da4acb201b6bc89759221db70b92a8fbaf1782d1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r65 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r65
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r65 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r65 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ba2aca5762fd69db45e58e62ab97e00deb46387d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r66 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r66
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r66 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r66 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-11dbc0314984fdd0ee1df7557817929c65a86a7c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r67 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r67
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r67 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r67 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7821df79f7323c0e17716376d905a782a49c06aa
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r68 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r68
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r68 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r68 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-22d0405681ce7b1bca9f3efefa6ae4e3be6ccd47
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r69 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r69
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r69 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r69 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3e2eb78979826606c6bbe2c8211fea891d132d39
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r7 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9d11a4f8ff8d45d1d768c50dc4e78ca354ab2ec9
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r70 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r70
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r70 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r70 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-46e1326f45c4f454819c6453196d5302b268476c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r72 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r72
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r72 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r72 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f8e5b30fa3c2c2c56d947a67a2afbec0767c874f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r73 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r73
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r73 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r73 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-10fc36ed358f60f4114aa2c7f946124f4b066953
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r74 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r74
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r74 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r74 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-28b3f9ad34ae0e12c951fc03c15f135a4a8f6f70
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r77 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r77
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r77 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r77 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-384ca599102d9455d078bb0ad8291460aa40dc83
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r78 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r78
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r78 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r78 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-532fb5c8b562b5784526caccefe568c031669858
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r79 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r79
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r79 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r79 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8f89faa88ef8f4bf48e42deb6b1e436a4ec322ba
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r8 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r8
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r8 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r8 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f65bdee853e768df58065bbe3fb83923c69abe03
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r80 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r80
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r80 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r80 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-feaa9150b8bef49866f6bc6d4d44ea7a06ae9438
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-6.0.1_r9 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-6.0.1_r9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f8832ab54c7bfe18e9d32414c4c94ad9a517de2d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r1 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1435ecf5caf6b88021acb5f7f64bc2a281da5a1b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r12 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r12
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r12 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r12 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-26a772b706d3f3c28324878e8f0d3b63990e6527
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r13 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r13
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r13 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r13 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-fdb853040dbfd0ca16b4a5c6b189e7bed56ea6bc
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r14 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r14
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r14 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r14 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e71e595427362e7a941e85d2103c5a1d798aeb9e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r15 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r15
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r15 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r15 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4bf8fca67ac7d772959c6693b0dddf1aa7c007c2
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r17 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r17
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r17 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r17 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a8be88d11b11ed346718444e0f31c70e33529cc1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r19 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r19
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r19 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r19 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9958edcc1eaf6328af76897ffe62eb59427f4a29
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r21 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r21
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r21 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r21 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-fbd7fefa9bc0fe38448d55c0c7bce2d351a564b4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r24 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r24
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r24 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r24 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f7d8c5d13e7f50a96e996af50f6f676fafad40a3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r27 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r27
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r27 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r27 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9a6947469a0783683e7c4e3ced141b4ce335e29c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r28 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r28
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r28 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r28 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-da405deb97588286264b9f9a8d4aae513bc332d5
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r29 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r29
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r29 2017-09-26 20:05:20.712016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r29 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-63b092664f33a23842205d0dc160796a70581f3f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r3 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8f7c6da58bd09ac66a5c0d2c523ee783eda50f2c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r30 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r30
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r30 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r30 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-118fe3968d8d48745f4bfaba84592767c251ab82
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r31 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r31
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r31 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r31 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-046bdaa80385e7ebce0db488b49620669d3bb0ff
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r32 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r32
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r32 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r32 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-50248d3c8c7e22228cf2c9ccc37bdfb5ae30d324
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r33 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r33
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r33 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r33 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1342ec79956bb063c08f81f99d27719498a205dd
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r4 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e243272f67dd2b38fdde068e0234c152326bcc1c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r5 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8af65cc529bcf9c20932397cdb538ac2c6636fb8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r6 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1407846630bb79a909aa3a46194c673920304a9c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.0.0_r7 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.0.0_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-af5427c03173d624548f6becf53277ae3e47dba1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r1 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-97af1f2c7d8a9d44353a34dfc8df25db5ee122f4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r2 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-92471c80ba28c22c65bd2d63b0a9bc6b7d8a6885
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r3 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-55e15fbb2104fd9b2d14c6906a2db3e0ae00cd04
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r4 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b58c798ef30a87a05ffb9ce0aa26ac14d390104b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r5 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-eba0e6b65c2367e2c4128fab29ad020f113ee2ba
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r6 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-218b54149199e51370779be243ad1ec145c28aea
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.0_r7 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.0_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4dd7fc7b960cb022c3cfe639bfe277d111a107ba
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r1 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b57ac604fcdb49c04e4f12f33086b0d0e285a816
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r10 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r10
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r10 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r10 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ba90aec6145e7eda5e9303b429ee1195d9667419
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r11 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r11
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r11 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r11 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9374f1ee519231f361c4b4cd113d88eedab00a2b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r12 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r12
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r12 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r12 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4556bbc394e66c82f8690673a225b5421f888e6d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r13 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r13
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r13 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r13 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ae256a75c05a9074c51bb061dde4fbde44d4dbf9
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r14 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r14
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r14 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r14 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-275070e3226815b72ec1912e2ca703de76d11536
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r15 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r15
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r15 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r15 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-bde0904ae3bc134f93bf63f33eaea6a84cbb4120
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r16 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r16
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r16 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r16 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-495292654e7dccf07fab598e1c83d7faceb8e80a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r17 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r17
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r17 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r17 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4ee6974a144b7cbaf91ebba8b19cc4ea736be0fc
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r2 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-883952c32ccc2db63cccb1431e2063501182ebae
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r20 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r20
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r20 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r20 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7177c89f0b8d72ac1a2d96ac8b36a6ccb41f1335
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r21 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r21
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r21 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r21 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7847c69e4733ef85f05af8325652c6d3e02a191f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r22 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r22
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r22 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r22 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4f9c910b3f80314eb067d74668b4bda63dc06450
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r23 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r23
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r23 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r23 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-385183bac816329af61681009b3f2c1609c79755
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r24 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r24
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r24 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r24 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e9fb78465f346f6ae515e40c30a938c45a4b3976
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r25 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r25
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r25 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r25 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d4aa04766465b92d0098004be0dcea1f0bf23c6b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r26 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r26
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r26 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r26 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-72c4a8d6fcb76f4db712cc2a49d2d6eadf76e7c4
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r27 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r27
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r27 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r27 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-db04a3706bd390e058790d18368b4df963ce6c5e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r28 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r28
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r28 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r28 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-aa44f5a4d2f1019ac4e6d3b63b99dd402faf1486
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r3 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-462732d9f44ae7adbe152fe10d01837169bd75bf
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r31 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r31
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r31 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r31 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a419dffe3b4625f87871fa9e1ed6471edc4a097b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r32 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r32
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r32 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r32 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c3fe1a5e294592bd823d5a200e78bd2f3c0ec3b3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r33 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r33
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r33 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r33 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3dc11e484aa0851086a2a0bc297bf16e1fc8d9c5
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r35 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r35
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r35 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r35 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a538eeb37c6b99cbc9a87ab94d8728985f42bd80
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r38 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r38
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r38 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r38 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-5776e13e1b5ab5b81d0e6c60388c6d3798c4c433
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r39 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r39
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r39 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r39 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-354e0fdecdad8f27cf1d4458670529d326a2afaa
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r4 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-5453a442ee117cf59ce7aadfc320b825cb009f1d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r40 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r40
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r40 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r40 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a4314f01a079a3f96b967d073ca7d7eb29470d75
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r41 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r41
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r41 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r41 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e3e8149ea3b295c0c012ff3956599e19e344c6af
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r42 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r42
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r42 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r42 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2d2f6dd4c8b18aef09f871abfbcdeb29137ab330
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r43 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r43
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r43 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r43 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3da94576c186f9f69d9cd4feaaa7b1a4ac32d23c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r44 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r44
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r44 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r44 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d8deb0fb455a0249a195697440b31a4588119e62
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r45 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r45
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r45 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r45 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-738bba2c4cd4ef0b0e88114506f7e4f4ae904063
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r46 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r46
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r46 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r46 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0284918f80a23432a73ff23d9191cb66b8cd1649
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r47 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r47
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r47 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r47 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-750be3110f465f7f4f35a004a886c6c33534acdb
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r48 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r48
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r48 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r48 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-be61d4eb2e2d51728deadc195f92b70d98f856d9
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r49 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r49
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r49 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r49 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-11b46719702e4aa951cd7e18ebf52e7621e9a5a0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r50 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r50
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r50 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r50 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-98ee5d0921c2962b9554ab2243a3253ae0ae453a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r51 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r51
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r51 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r51 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-eb2d2afb10e728ce64824cd01977d3f7af77d18a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r52 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r52
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r52 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r52 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-71c9f38e6b0ddd17ea4ff04704412c1a5d26846b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r53 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r53
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r53 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r53 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-69940f5246fe328ad029ecbaa21550aca63d1cde
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r6 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-968eefd652835185a7b7d00d6b8cf4656454569b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r7 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-57228088c0d47f0dcaa9e176d8096086d10cb87b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r8 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r8
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r8 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r8 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-79c8ce924717290c5da7c6171990085fe52fb186
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.1_r9 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.1_r9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e35bfb0e573ba885e91d41333c6ae78b0c6bde7a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r1 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c198888e16146eb79dfb2d1298fdbcce36d93786
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r10 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r10
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r10 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r10 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d77a779f2cfad9842c833e8eb4444b75052e9ce6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r11 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r11
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r11 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r11 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3eeec7e0c471ee3dd93543652151e5d6b5ed2ee8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r12 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r12
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r12 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r12 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-019e0ed3fb6788f19ee668b61a6161f072714cb7
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r13 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r13
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r13 2017-09-26 20:05:20.708016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r13 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-151bab4afe8a83ee896354d6118c318ee8961cbe
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r14 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r14
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r14 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r14 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0a97d5b7cceff923b24b41866444e131428cfdd8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r15 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r15
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r15 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r15 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-dfbb84b00676accb8e574a82d25b780515f2780d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r16 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r16
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r16 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r16 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-fb084a3ed5081fdae51384507b4dfcb551f2cb45
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r17 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r17
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r17 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r17 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-83658b343c6fd5f249d6cb4c31b031b2d1e52d37
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r18 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r18
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r18 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r18 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1806445087fdba78a4b0abd83ae6dfa0761fc440
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r19 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r19
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r19 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r19 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f367b67d46466c1baa469619808234be571ab858
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r2 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c34f3fd7dfccd7380fc9b788c3d6318822576e5d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r23 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r23
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r23 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r23 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6eca507d88c2359a3a719458da4758e059fad91c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r24 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r24
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r24 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r24 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-075c8d7f3419a3a9c3c3ae3d6c3bca10ecb14c00
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r25 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r25
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r25 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r25 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1aadabe691f137abb6e5073c0affeb15d4bb1371
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r27 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r27
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r27 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r27 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-590b5de0e60d2b8f0375f347588c664bf98b50bf
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r28 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r28
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r28 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r28 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-686083b0b25500480ecdb2ee8a7bfecd0067b3e2
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r29 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r29
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r29 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r29 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-17aab052ce0edf04f9f94f94628db7783cc8f125
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r3 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-52d8d95a55ad7a02152e2cc342c7182f193b02e5
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r30 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r30
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r30 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r30 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-36322e064d5263bab405ebd904b6270cb95b867f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r32 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r32
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r32 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r32 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e1607367ef92a1f1021223fd89579e9e11790c09
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r33 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r33
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r33 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r33 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-225d4c3717fd20f9e67682011d0a8ba21071fdfd
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r4 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0731dfa2dd620d7b50ad9c35e1ee31ba5cc02da1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r5 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1eec6ad9b198b0970dc9e91ece8658d7c881eeb8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r6 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-640fe89ec91d53e8b45f0859696bf1c952d736de
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r8 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r8
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r8 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r8 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-629bd6cbb2c101d73ad0c7d8b1163c1e99a2eebe
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-7.1.2_r9 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-7.1.2_r9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4e1b19b1df71f5d29ee5f093921a23b6407b1c11
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r1 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a466ebae505acc82bb15e5dc0f9355c1b21dd511
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r10 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r10
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r10 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r10 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-147b5cbacef0621f9ac995fb08231f43c67e8fea
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r11 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r11
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r11 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r11 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-86c5bd2a179dfc5e68722ad1d929cad2dce0c8cc
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r12 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r12
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r12 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r12 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a7a2b91eda73b1139b3109f565e86b11a9f26ca9
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r2 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-aa273e0a9a0b303a653ae0571bf15ee85bac8e70
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r3 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1d48d1a20bc8b1dd8a29a839f95ee6a90ce6dd94
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r4 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-3cc8682471c55c20c29990a664d948f6dfad18f8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r7 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1eca94f4ae822ff15b20b324c9c8a04055970e8f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-8.0.0_r9 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-8.0.0_r9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d59a74a2e1e3f233074b0e371382c477ce1dd9a0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-2.2_r8 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-2.2_r8
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-2.2_r8 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-2.2_r8 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1d6f0b1c725460a8a90a435e7111754eb0a8d02f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r10 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r10
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r10 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r10 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ff3daf4bb86a57b3cad09849536768c56c92a2ed
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r11 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r11
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r11 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r11 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-67d6db9a0b898c54a796d08894e210d808c09a38
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r12 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r12
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r12 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-2.3_r12 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e2855c235a1b66864148e61cf28f1f87e18a90a0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.0.3_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.0.3_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.0.3_r1 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.0.3_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b5241ef6f2805f6cf2c406be59b13f2a6d3b3f08
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.0.3_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.0.3_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.0.3_r2 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.0.3_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-edf33951e152cd08f136eb413bca3cc00ec849b0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.0_r1 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-342cba536baa4365715c09a1d77329bf1c470931
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r1 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8492870661a4cc6bdb1af9838150f98ec6d3e322
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r2 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-db401c3b653b066647f80d59b1a8ac48c67de6c8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r4 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.1_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-10f7df4b38637ad22c404216faecd3d58181703d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.2_r1 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-34f1397ca13ccb23c25aa0b8bc0c12a6c17ce7b8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.2_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.2_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.2_r2 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.2_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-eef9f5e3500bf4ba596a57458f1c6ea5ec650765
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.4_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.4_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.4_r1 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.4_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-5d8caf425e2a5d6a84fdeea3f0607098ce3c97ab
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.4_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.4_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-4.4_r4 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-4.4_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-5d4a5289af07d57eaef771cf9c1ebef13186c1d9
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r3 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0d37c7bfc642e27cbb849ab8b495189310889fe1
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r4 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-54098dbdcd0158ec422fa4e659054acad1701384
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r5 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0f7a932e76a4716f0a6ad192cd18d538b82c5046
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r6 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-934560b4f0a259d76875e91b79b970ab4ac52881
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r7 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9ce1bcec784c98740076ba282fd6739f300c4753
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r8 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r8
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r8 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r8 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-27342c0cd139bd177a4eab9d678e843473691440
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r9 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.0_r9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ada644361750647c050a825e1dcb4c6bd61e47cb
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r1 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-792d70f912a9b300eb6429f6438cd6c69ed76d6b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r10 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r10
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r10 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r10 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-00da40782480588e187a9e7e00760b220030f563
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r13 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r13
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r13 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r13 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-73978860966412443be5c99279eaae3a501ce75c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r14 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r14
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r14 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r14 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-487fbf09c495c28d6446a125a7d26815593941a5
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r15 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r15
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r15 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r15 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d590dcbfdeaef61395ea55d8b1417f4279382670
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r16 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r16
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r16 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r16 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b8e641ba8721946ccdd3757c681729922c8cc1e6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r17 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r17
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r17 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r17 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f527f306dd420d3ea1079182b8e83ca6c2833bce
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r18 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r18
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r18 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r18 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-bcf629b0418d21b71f23809daee7112502cd936e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r19 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r19
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r19 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r19 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-181f59cd260afeef19f5ca5cd51ad61e06ac96bc
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r2 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9ea78b7e45ca16f27e0583e45494a42ecaee9fd3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r20 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r20
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r20 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r20 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0b18ceb0b8c76abbd82de50f2ee2a4e502ddd1f9
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r21 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r21
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r21 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r21 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-39fbed5218776464c3c62a3639bf6d813e4f6a17
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r22 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r22
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r22 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r22 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-002a7d5287c7bcbd3b2ca3feea722be588acb8ca
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r23 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r23
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r23 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r23 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-12441b3c66d53ae32262ead5545f33af34859d51
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r3 2017-09-26 20:05:20.704016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-5a61298c3d3a7b6a84c1edf9a82a8d61bd58bb3b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r4 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0280687ebd5a2cb2fa6acebd2e8632acf921c38c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r5 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9ee1efcfa9b5c5c20a8caf27615a74bc56baa150
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r6 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f0c635d20ddf2713cc40732bef04c1be197ecf94
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r7 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e8dfa0966d1cc4e845f1b37c7d2bad7ed02fe8a5
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r8 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r8
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r8 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r8 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-72c61303901908a58346878ad3bc913f4ae3549e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r9 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-5.1_r9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-01cb9541470de8e64e7f5310fa63bed4c3b786dc
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r1 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d49cbd55819e2c6adebffc66525850164da2ef7c
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r12 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r12
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r12 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r12 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c8ea875aeb78632aa22d8ce82f50b6bda9e1d005
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r13 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r13
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r13 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r13 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-432bf9ac7ed772a31dd3465cace83a960918758e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r14 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r14
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r14 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r14 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b61871442a799c7fd86bd552f5aefccbb8e78c8d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r15 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r15
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r15 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r15 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1efab2917a9342259842d650733adf8f9385828e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r16 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r16
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r16 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r16 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7e58f9c798beb71f77247c084d38e4284be32002
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r17 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r17
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r17 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r17 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-30596811b3e501d28ba32345b1d1d6f788396fa8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r18 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r18
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r18 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r18 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-28a0e39cd7193ee5a4c893ec9d815598b0e7741b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r19 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r19
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r19 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r19 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4f1edde8cac04ecb1aa783b1c757ab95dada6f0e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r2 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6548d444f5eea938c27ac3cdb831c64a562b6350
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r20 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r20
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r20 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r20 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9735067ca9527fb328a96dc71bed41609aedb633
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r21 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r21
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r21 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r21 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-32daa160238c3c9e0562523c034792174b46c2fd
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r22 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r22
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r22 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r22 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7bba322b2548b4b3fc8c317059833c569e6fa845
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r3 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-5ca2185f4cc76a9d397ab473c908357ad9f64521
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r4 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-32e05f818ca29137ef2bba6124a20e9ec2c3b030
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r5 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-66695b1996017932675525f1e95871235ca38ad9
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r6 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-fa9bc24f4ebbe763e62a87c3126a17a45d40a389
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r7 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d1357a88ca3bf095d093cd207390fc9af2d3af8a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r8 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r8
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r8 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r8 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e81378a2573d717ddf67d29b3bd3283bf32e004e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r9 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-6.0_r9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c288d5cdbf40b4e07d736c65c09a63ef03f3576b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r1 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a47e52360f87fefb7e14c4f7e6364c4bb19c89d7
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r10 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r10
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r10 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r10 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ca3fd33289c695854f60e93658d127d1beae3e56
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r11 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r11
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r11 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r11 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-bf2931d145fb1a9c64547e06054ef0ef1c98a1f3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r12 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r12
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r12 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r12 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f9a5f7ec47c4550ceedf304170293eb7c3b944e7
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r13 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r13
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r13 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r13 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c03cda12f49bef887d2020470c2d575f1fae3801
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r2 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6cddfdbf572d5c4d2f1f270247970801cf100310
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r3 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-28c55a0c17cd248552afc9bda9d7468d78e30293
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r4 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-71523f6482c8678912014adfa1eb08b2416c2a13
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r5 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-6923796eb6aa1adcd985dc8f011e97b2f177ed9e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r6 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1b56f562dc4159f57c8ccedc2272f43eb5c920ad
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r7 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-17d4942ffb40405b65878abaff03f887a8ca79c7
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r8 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r8
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r8 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r8 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-20b77f7625e26dcc39c54f7025078ebdacbea446
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r9 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.0_r9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e698b2df31633c3226a8a06769152038c2c23f84
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r1 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-15799ff68a489f4a1da0f22375d0bfb45749d5f3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r2 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-29f05f4cdc398a8cb7f6b003c03cc0c93b71a46d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r3 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0c40138892ddcab4179c833e00831029aa1eae36
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r4 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-c5c2b3e7a73e1cc5f28af8c53a2029f5e86c4e69
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r5 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f17528c30c243ab5bf53e9ce5146810e9ac3a5d6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r6 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r6
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r6 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r6 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4d3c3746a597da45fc5efa404f02d75d449eb31d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r7 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r7
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r7 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r7 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-fda82a219049bfb7eb10c7aa9a8c5bcea26a4525
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r8 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r8
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r8 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r8 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1df9b098cdf062da5c8d710a6c25e15c5e5022ae
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r9 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r9
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r9 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-7.1_r9 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-94206920c27de0d4b82169cdecdd341d5bb61b2f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-8.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-8.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-8.0_r1 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-8.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9b203298e8b8f35061ab9fbf4aa71d0d6a846869
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-verifier-4.0.3_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-verifier-4.0.3_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-verifier-4.0.3_r1 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-verifier-4.0.3_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-bf1b58a36c0c1adab54eb4424d5ca4b75ac29dc8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-verifier-4.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-verifier-4.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-cts-verifier-4.0_r1 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-cts-verifier-4.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-04e74f3d83a3c005ecc6b1ec2d050fe7e21db1a6
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-l-preview_r2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-l-preview_r2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-l-preview_r2 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-l-preview_r2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-d5bef697b91dc38f2dab2895fba2f5a4ce2baa48
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-m-preview SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-m-preview
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-m-preview 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-m-preview 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-19586bfd0f22621286ddd06c8e6e161eb437b629
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-m-preview-1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-m-preview-1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-m-preview-1 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-m-preview-1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-e3c347299d9ae248284a47b1e46cf0c8c9f3df34
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-m-preview-2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-m-preview-2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-m-preview-2 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-m-preview-2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-86bf183ab6c03d955e8df12c47b73690d7145ee0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-iot-preview-2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-iot-preview-2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-iot-preview-2 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-iot-preview-2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f0fae26ca7cada23270ccc885139d8b171b5d9c8
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-iot-preview-4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-iot-preview-4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-iot-preview-4 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-iot-preview-4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-de55b2d427e9c534074f9826891945ad4889e4ef
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-mr1-preview-1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-mr1-preview-1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-mr1-preview-1 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-mr1-preview-1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ac688e41d396c8f95bb99a9b141d4031a1144dcd
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-mr1-preview-2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-mr1-preview-2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-mr1-preview-2 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-mr1-preview-2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8cd078c21e1f95e2ed3464daa89d3fee534a1999
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-mr2-preview-1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-mr2-preview-1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-mr2-preview-1 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-mr2-preview-1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-2e68569ce74dad982fda705fa5ed6eddb146bbd3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-mr2-preview-2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-mr2-preview-2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-mr2-preview-2 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-mr2-preview-2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-1787188145a43f33d447146d6d598a605332f32e
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-preview-1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-preview-1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-preview-1 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-preview-1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8417f6413117db91c405f51491a85db67980e08a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-preview-2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-preview-2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-preview-2 2017-09-26 20:05:20.700016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-preview-2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a02b4459a64656ccee9bd21e31df91bb4e239b15
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-preview-3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-preview-3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-preview-3 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-preview-3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-ffbf1109b6cc7b00a0f75134df7e2941a973cc34
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-preview-4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-preview-4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-preview-4 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-preview-4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-274914082e4ea3b8d33943142454255555494a2d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-preview-5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-preview-5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-n-preview-5 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-n-preview-5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-0ea2a4503a2a360fff6825be94e49683f7579150
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-o-iot-preview-5 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-o-iot-preview-5
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-o-iot-preview-5 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-o-iot-preview-5 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-8abd89486611a756b9d9aca98f296857e60f066d
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-o-preview-1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-o-preview-1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-o-preview-1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-o-preview-1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-afd03023fe863886118422b322aafa21cb6f71c2
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-o-preview-2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-o-preview-2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-o-preview-2 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-o-preview-2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-30c29a3a781e99225920d2d0234fe96004edc9f0
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-o-preview-3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-o-preview-3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-o-preview-3 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-o-preview-3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b31c04dc3e37502797648544dc1f3e23a85ab38f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-o-preview-4 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-o-preview-4
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-o-preview-4 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-o-preview-4 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4276e955888fcf20dfcf10352dac1d573387b05f
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-4.0.3_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-4.0.3_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-4.0.3_r1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-4.0.3_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-f93530e46835c09519012015fa5e2a621d41b20b
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-4.0.3-tools_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-4.0.3-tools_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-4.0.3-tools_r1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-4.0.3-tools_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4ce65ea791f3d7092fc06a9abfffe8e313c4dc5a
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-4.4.2_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-4.4.2_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-4.4.2_r1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-4.4.2_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-4b21be2684e2741eecfd9643809afd20d02e8c31
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-4.4.2_r1.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-4.4.2_r1.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-4.4.2_r1.0.1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-4.4.2_r1.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-9875d29f26c016d281409488090907b35d7f6673
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-adt_r16.0.1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-adt_r16.0.1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-adt_r16.0.1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-adt_r16.0.1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7c9f5760fa5c34902c208b43be675cfc301f3176
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-adt_r20 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-adt_r20
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-adt_r20 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-adt_r20 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-b5ecaa481dfc082e5678f87b682aad3654c107fc
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-support_r11 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-support_r11
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-sdk-support_r11 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-sdk-support_r11 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-a565a2a5db7d20789c049346ebc6a11b67292796
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-5.0.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-5.0.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-5.0.0_r1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-5.0.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-16d4beb85e7a34760e3316839b5ff35db1abce79
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-5.1.0_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-5.1.0_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-5.1.0_r1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-5.1.0_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-723fdcd38c9949de2d7d54a5bd71bd5b036f2590
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-5.1.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-5.1.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-5.1.1_r1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-5.1.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-80093b9548e17d6fb95314e212d60ea67cdab9be
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-7.1.1_r1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-7.1.1_r1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-7.1.1_r1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-7.1.1_r1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7349878277abbc558466d730983fa6b2081ec3d5
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-n-preview-1 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-n-preview-1
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-n-preview-1 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-n-preview-1 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-7ec3b9cf833564190c3f19910554b1d0e220e8b3
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-n-preview-2 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-n-preview-2
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-n-preview-2 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-n-preview-2 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-039c65f0768b6fa170463aec35b20d24c54f9996
diff -urN Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-o-preview-3 SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-o-preview-3
--- Android_6.0.1_r11/packages/apps/Settings/.git/refs/tags/android-wear-o-preview-3 2017-09-26 20:05:20.696016083 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/.git/refs/tags/android-wear-o-preview-3 1970-01-01 09:00:00.000000000 +0900
@@ -1 +0,0 @@
-400139abb91f48ee562b3fa2ebfc2ec054fcf0a6
diff -urN Android_6.0.1_r11/packages/apps/Settings/res/layout/activity_dialog.xml SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/layout/activity_dialog.xml
--- Android_6.0.1_r11/packages/apps/Settings/res/layout/activity_dialog.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/layout/activity_dialog.xml 2017-03-16 23:47:33.000000000 +0900
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/Settings/res/layout/collaboroid_dialog_row.xml SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/layout/collaboroid_dialog_row.xml
--- Android_6.0.1_r11/packages/apps/Settings/res/layout/collaboroid_dialog_row.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/layout/collaboroid_dialog_row.xml 2016-12-08 01:00:12.000000000 +0900
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/Settings/res/layout/collaboroid_dialog.xml SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/layout/collaboroid_dialog.xml
--- Android_6.0.1_r11/packages/apps/Settings/res/layout/collaboroid_dialog.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/layout/collaboroid_dialog.xml 2016-12-08 01:00:12.000000000 +0900
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/Settings/res/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/Settings/res/values/dimens.xml 2017-09-27 02:08:14.267735784 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/values/dimens.xml 2017-03-26 17:43:10.646197000 +0900
@@ -256,4 +256,14 @@
40dp
10dp
+
+
+ 25dp
+ 32dip
+ 16dip
+
+
+ 16dp
+ 16dp
+
diff -urN Android_6.0.1_r11/packages/apps/Settings/res/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/values/strings.xml
--- Android_6.0.1_r11/packages/apps/Settings/res/values/strings.xml 2017-09-27 02:08:14.267735784 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/values/strings.xml 2016-12-08 01:00:14.000000000 +0900
@@ -1395,6 +1395,28 @@
Allow apps on other devices to discover apps on this device
+
+
+ CollaboRoid
+ CollaboRoid
+
+ CollaboRoid settings
+ No Remote Device...
+
+ Rfr
+ Strt
+
+ Resource
+ Ask
+ Request
+ Allow
+
+ Submit
+ Cancel
+
+
+
+
Wi\u2011Fi
@@ -7036,4 +7058,7 @@
Use sRGB
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/Settings/res/values/styles.xml SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/values/styles.xml
--- Android_6.0.1_r11/packages/apps/Settings/res/values/styles.xml 2017-09-27 02:08:14.271735784 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/values/styles.xml 2016-12-08 01:00:14.000000000 +0900
@@ -357,4 +357,28 @@
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/Settings/res/xml/collaboroid_settings.xml SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/xml/collaboroid_settings.xml
--- Android_6.0.1_r11/packages/apps/Settings/res/xml/collaboroid_settings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/xml/collaboroid_settings.xml 2016-12-08 01:00:14.000000000 +0900
@@ -0,0 +1,20 @@
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/Settings/res/xml/dashboard_categories.xml SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/xml/dashboard_categories.xml
--- Android_6.0.1_r11/packages/apps/Settings/res/xml/dashboard_categories.xml 2017-09-27 02:08:14.271735784 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/res/xml/dashboard_categories.xml 2016-12-08 01:00:14.000000000 +0900
@@ -31,6 +31,14 @@
android:icon="@drawable/ic_settings_wireless"
/>
+
+
+
+
askedResources = new HashMap();
+ private HashMap allowedResources = new HashMap();
+
+ private CheckBox[] resourceCheckBoxes = new CheckBox[Device.RESOURCE_TYPE_SIZE];
+ private int[][] resources = new int[2][Device.RESOURCE_TYPE_SIZE];
+
+ private View mView;
+ //private WifiConfigController mController;
+
+ public CollaboRoidDialog(Context context, OnClickListener listener,
+ RemoteDevice remoteDevice, boolean edit) {
+ super(context);
+ mEdit = edit;
+ mListener = listener;
+ mRemoteDevice = remoteDevice;
+ }
+
+ public CollaboRoidDialog(Context context, OnClickListener listener,
+ RemoteDevice remoteDevice) {
+ super(context);
+ mEdit = false;
+ mListener = listener;
+ mRemoteDevice = remoteDevice;
+ }
+
+ /*@Override
+ public WifiConfigController getController() {
+ return mController;
+ }*/
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState)
+ {
+ //mView = getLayoutInflater().inflate(R.layout.collaboroid_dialog, null);
+ mView = getLayoutInflater().inflate(R.layout.collaboroid_dialog, null);
+ setView(mView);
+ setInverseBackgroundForced(true);
+ //mController = new WifiConfigController(this, mView, mRemoteDevice, mEdit);
+ super.onCreate(savedInstanceState);
+
+ ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);
+
+ Log.d(TAG, mRemoteDevice.name + " - " + mRemoteDevice.description);
+
+ for(int resource : mRemoteDevice.resources)
+ addRow(group, resource, mRemoteDevice.askedResources[resource]==1, mRemoteDevice.allowedResources[resource]==1);
+ }
+
+ private void addRow(ViewGroup group, int resource, Boolean isAsked, Boolean isAllowed)
+ {
+ View row = this.getLayoutInflater().inflate(R.layout.collaboroid_dialog_row, group, false);
+
+ ((TextView) row.findViewById(R.id.name)).setText(Device.ResourceNames[resource]);
+
+ CheckBox cb = (CheckBox) row.findViewById(R.id.checkbox_ask);
+ cb.setChecked(isAsked);
+ cb.setTag(resource);
+ cb.setOnCheckedChangeListener(new OnCheckedChangeListener()
+ {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+ {
+ // TODO Auto-generated method stub
+ String msg = buttonView.getText().toString();
+
+ askedResources.put(msg, isChecked);
+
+ resources[0][Integer.parseInt(buttonView.getTag().toString())] = isChecked?1:0;
+
+ Log.d(TAG, buttonView.getTag() + " - " + isChecked);
+ }
+ });
+ resourceCheckBoxes[resource] = cb;
+
+ /*CheckBox cb2 = (CheckBox) row.findViewById(R.id.checkbox_allow);
+ cb2.setChecked(isAllowed);
+ cb2.setTag(resource);
+ cb2.setOnCheckedChangeListener(new OnCheckedChangeListener()
+ {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+ {
+ // TODO Auto-generated method stub
+
+ String msg = buttonView.getText().toString();
+
+ allowedResources.put(msg, isChecked);
+
+ resources[1][Integer.parseInt(buttonView.getTag().toString())] = isChecked?1:0;
+
+ Log.d(TAG, buttonView.getTag() + " - " + isChecked);
+ }
+ });*/
+
+ group.addView(row);
+
+ askedResources.put(Device.ResourceNames[resource], true);
+ //allowedResources.put(Device.ResourceNames[resource], true);
+
+
+ }
+
+ public int[] getAskedResources()
+ {
+ for(int i=0; i selectedRemoteDevices = new ArrayList();
+
+
+
+ public CollaboRoidSettings() {
+ super(DISALLOW_CONFIG_WIFI);
+ mFilter = new IntentFilter();
+ mFilter.addAction(CollaboRoidManager.COLLABOROID_STATE_CHANGED_ACTION);
+
+ mReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ // TODO Auto-generated method stub
+ if(intent.getIntExtra(CollaboRoidManager.EXTRA_COLLABOROID_STATE, CollaboRoidManager.COLLABOROID_STATE_UNKNOWN)
+ == CollaboRoidManager.COLLABOROID_STATE_DISABLED)
+ setOffMessage();
+ }
+ };
+ }
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ // Set this flag early, as it's needed by getHelpResource(), which is called by super
+
+ Log.d(TAG, "onCreate");
+ super.onCreate(icicle);
+ }
+
+ @Override
+ public View onCreateView(final LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+
+ Log.d(TAG, "onCreateView");
+
+ return super.onCreateView(inflater, container, savedInstanceState);
+
+ }
+
+ @Override
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+
+ final Activity activity = getActivity();
+ mDeviceManager = (DeviceManager) getSystemService(Context.DEVICE_MANAGEMENT_SERVICE);
+ mRemoteManager = (RemoteServiceManager) getSystemService(Context.REMOTE_SERVICE);
+
+ //final Intent intent = activity.getIntent();
+ addPreferencesFromResource(R.xml.collaboroid_settings);
+
+ actionBarSwitch = new Switch(activity);
+
+ if (activity instanceof SettingsActivity) {
+
+ Log.d("AAAAAAAAAAA", "AAAAAAAAAAAA");
+ SettingsActivity settingsActivity = (SettingsActivity) activity;
+ Log.d("AAAAAAAAAAA", "AAAAAAAAAAAA");
+ final int padding = activity.getResources().getDimensionPixelSize(
+ R.dimen.action_bar_switch_padding);
+ actionBarSwitch.setPaddingRelative(0, 0, padding, 0);
+ activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+ ActionBar.DISPLAY_SHOW_CUSTOM);
+ activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
+ ActionBar.LayoutParams.WRAP_CONTENT,
+ ActionBar.LayoutParams.WRAP_CONTENT,
+ Gravity.CENTER_VERTICAL | Gravity.END));
+
+ }
+
+ mCollaboRoidEnabler = new CollaboRoidEnabler(activity, actionBarSwitch);
+
+ mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
+ getListView().setEmptyView(mEmptyView);
+
+ registerForContextMenu(getListView());
+ setHasOptionsMenu(true);
+ }
+
+ @Override
+ protected int getMetricsCategory() {
+ return MetricsLogger.WIFI;
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ if(mCollaboRoidEnabler != null)
+ {
+ mCollaboRoidEnabler.resume();
+ }
+ getActivity().registerReceiver(mReceiver, mFilter);
+ updateRemoteDevices();
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ if(mCollaboRoidEnabler != null)
+ {
+ mCollaboRoidEnabler.pause();
+ }
+ getActivity().unregisterReceiver(mReceiver);
+ }
+
+ @Override
+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ TypedArray ta = getActivity().getTheme().obtainStyledAttributes(
+ new int[] {R.attr.ic_menu_add, R.attr.ic_wps});
+
+ menu.add(Menu.NONE, MENU_REFRESH_ID, 0, R.string.collaboroid_menu_refresh)
+ //.setIcon(ta.getDrawable(1))
+ .setEnabled(true)
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+ menu.add(Menu.NONE, MENU_START_ID, 0, R.string.collaboroid_menu_start)
+ //.setIcon(ta.getDrawable(0))
+ .setEnabled(true)
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ /*menu.add(Menu.NONE, 2, 0, R.string.wifi_menu_scan)
+ // .setIcon(R.drawable.ic_menu_scan_network)
+ .setEnabled(true)
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);*/
+ ta.recycle();
+
+ super.onCreateOptionsMenu(menu, inflater);
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+
+
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // If the user is not allowed to configure wifi, do not handle menu selections.
+ // if (isRestrictedAndNotPinProtected()) return false;
+
+ Log.d(TAG, "onOptionItemSelected: " + item.getItemId());
+ if(item.getItemId() == MENU_REFRESH_ID)
+ {
+ updateRemoteDevices();
+ mRemoteManager.refreshDevices();
+ }
+ else if(item.getItemId() == MENU_START_ID)
+ {
+ //mDeviceManager.constructCluster(remoteDevicesToDevices(selectedRemoteDevices));
+ mDeviceManager.askResources(remoteDevicesToDevices(selectedRemoteDevices));
+ Log.d(TAG, selectedRemoteDevices.get(0).toString() + " AAAAAAAAAAAAAAAA");
+ //Client 1
+ mRemoteManager.startServer();
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+ public List remoteDevicesToDevices(List remoteDevices)
+ {
+ List devices = new ArrayList();
+
+ for(RemoteDevice rd : remoteDevices)
+ devices.add(rd.getDevice());
+
+ return devices;
+ }
+
+ @Override
+ public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
+
+ }
+
+ @Override
+ public boolean onContextItemSelected(MenuItem item) {
+ Log.d(TAG, "onContextItemSelected: " + item.getItemId());
+
+ return super.onContextItemSelected(item);
+ }
+
+ @Override
+ public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+
+ //here!!
+ if (preference instanceof RemoteDevice)
+ {
+ if(((CheckBoxPreference)preference).isChecked())
+ {
+ selectedRemoteDevices.add((RemoteDevice)preference);
+ mSelectedRemoteDevice = (RemoteDevice) preference;
+ showDialog(mSelectedRemoteDevice);
+ }
+ else
+ selectedRemoteDevices.remove(preference);
+ }
+ else
+ return super.onPreferenceTreeClick(screen, preference);
+
+ return true;
+ }
+
+ private void showDialog(RemoteDevice remoteDevice)
+ {
+ if (mDialog != null)
+ {
+ //removeDialog(REMOTE_DEVICE_DIALOG_ID);
+ mDialog = null;
+ }
+
+ // Save the access point and edit mode
+ mDlgRemoteDevice = remoteDevice;
+ //mDlgEdit = edit;
+
+ showDialog(REMOTE_DEVICE_DIALOG_ID);
+ }
+
+
+ @Override
+ public Dialog onCreateDialog(int dialogId) {
+
+
+ switch (dialogId)
+ {
+ case REMOTE_DEVICE_DIALOG_ID:
+ RemoteDevice rd = mDlgRemoteDevice; // For manual launch
+ Log.d(TAG, "onCreateDialog: " + rd.name);
+
+ // null exception !!!!!!!!!!!!!!!!!!!!!!!!
+
+ /*if (rd == null)
+ { // For re-launch from saved state
+ if (mAccessPointSavedState != null)
+ {
+ ap = new AccessPoint(getActivity(), mAccessPointSavedState);
+ // For repeated orientation changes
+ mDlgRemoteDevice = ap;
+ // Reset the saved access point data
+ mAccessPointSavedState = null;
+ }
+ }*/
+ // If it's still null, fine, it's for Add Network
+ //mSelectedAccessPoint = ap;
+
+ mDialog = new CollaboRoidDialog(getActivity(), this, rd);
+ mDialog.setSubmitButton(getActivity().getString(R.string.collaboroid_submit));
+ mDialog.setCancelButton(getActivity().getString(R.string.collaboroid_cancel));
+ mDialog.setTitle(rd.name);
+ return mDialog;
+ }
+
+ return super.onCreateDialog(dialogId);
+ }
+
+
+ @Override
+ public void onClick(DialogInterface dialogInterface, int button) {
+ /*if (button == WifiDialog.BUTTON_FORGET && mSelectedAccessPoint != null) {
+ forget();
+ } else if (button == WifiDialog.BUTTON_SUBMIT) {
+ if (mDialog != null) {
+ submit(mDialog.getController());
+ }
+ }*/
+
+ Log.d(TAG, "onClick: " + button);
+ if (button == CollaboRoidDialog.BUTTON_SUBMIT)
+ {
+ if (mDialog != null)
+ {
+ submit(mDialog);
+ }
+ }
+ }
+
+ void submit(CollaboRoidDialog dialog)
+ {
+ mSelectedRemoteDevice.setAllowedResources(dialog.getAllowedResources());
+ mSelectedRemoteDevice.setAskedResources(dialog.getAskedResources());
+
+ /*int[] resources = dialog.getAllowedResources();
+ for(int i=0; i<7; i++)
+ Log.d(TAG, "allow: " + resources[i]);
+
+ int[] resources2 = dialog.getAskedResources();
+ for(int i=0; i<7; i++)
+ Log.d(TAG, "ask: " + resources2[i]);
+
+ Log.d(TAG, "TEST:" + resources2.toString());*/
+
+
+ }
+
+ @Override
+ protected int getHelpResource() {
+
+ return R.string.help_url_wifi;
+ }
+
+ private void updateRemoteDevices()
+ {
+ // Safeguard from some delayed event handling
+ if (getActivity() == null)
+ return;
+
+ final Collection remoteDevices = findRemoteDevices();
+ getPreferenceScreen().removeAll();
+
+ /*ArrayList resources = new ArrayList();
+ resources.add("Touch");
+ resources.add("Key");
+ resources.add("Sensor");
+ resources.add("Location");
+ resources.add("Audio");
+ resources.add("Video");
+
+ RemoteDevice rd = new RemoteDevice(getActivity(), "JAKE", "21%", resources);
+ getPreferenceScreen().addPreference(rd);
+
+ rd = new RemoteDevice(getActivity(), "SAM", "45%", resources);
+ getPreferenceScreen().addPreference(rd);*/
+
+ /*if (remoteDevices.size() == 0)
+ {
+ addMessagePreference(R.string.collaboroid_empty_list);
+ }
+ else*/
+
+ if(mDeviceManager.getNumofConfiguredDevices() > 0)
+ {
+ for (RemoteDevice remoteDevice : remoteDevices)
+ {
+ Device rd = mDeviceManager.getDevice(remoteDevice.name);
+ if(rd != null)
+ {
+ remoteDevice.setAskedResources(rd.askedResources);
+ remoteDevice.setAllowedResources(rd.allowedResources);
+ remoteDevice.setChecked(true);
+ }
+
+ getPreferenceScreen().addPreference(remoteDevice);
+ }
+ }
+ else
+ for (RemoteDevice remoteDevice : remoteDevices)
+ {
+ getPreferenceScreen().addPreference(remoteDevice);
+ }
+ }
+
+ private void setOffMessage()
+ {
+ if (mEmptyView != null) {
+ mEmptyView.setText(R.string.collaboroid_empty_list);
+ }
+ getPreferenceScreen().removeAll();
+ }
+
+
+ private void addMessagePreference(int messageId)
+ {
+ if (mEmptyView != null)
+ mEmptyView.setText(messageId);
+ getPreferenceScreen().removeAll();
+ }
+
+ List findRemoteDevices()
+ {
+ List devices = mDeviceManager.getDeviceList(1);
+ ArrayList remoteDevices = new ArrayList();
+
+ // need to be modified
+ ArrayList resources = new ArrayList();
+
+ resources.add(Device.RESOURCE_TYPE_TOUCH);
+ resources.add(Device.RESOURCE_TYPE_KEY);
+ resources.add(Device.RESOURCE_TYPE_SENSOR);
+ resources.add(Device.RESOURCE_TYPE_LOCATION);
+ resources.add(Device.RESOURCE_TYPE_VIDEO);
+ resources.add(Device.RESOURCE_TYPE_AUDIO);
+ resources.add(Device.RESOURCE_TYPE_VIBRATOR);
+ resources.add(Device.RESOURCE_TYPE_REMOTE_ACTIVITY);
+
+
+ for(Device device : devices)
+ {
+ RemoteDevice remoteDevice = new RemoteDevice(getActivity(), device, resources);
+ remoteDevices.add(remoteDevice);
+ Log.d(TAG, device.toString());
+ }
+
+ return remoteDevices;
+ }
+
+ /**
+ * Used as the outer frame of all setup wizard pages that need to adjust their margins based
+ * on the total size of the available display. (e.g. side margins set to 10% of total width.)
+ */
+ public static class ProportionalOuterFrame extends RelativeLayout {
+ public ProportionalOuterFrame(Context context) {
+ super(context);
+ }
+ public ProportionalOuterFrame(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+ public ProportionalOuterFrame(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ }
+
+ /**
+ * Set our margins and title area height proportionally to the available display size
+ */
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
+ int parentHeight = MeasureSpec.getSize(heightMeasureSpec);
+ final Resources resources = getContext().getResources();
+ float titleHeight = resources.getFraction(R.dimen.setup_title_size, 1, 1);
+ float sideMargin = resources.getFraction(R.dimen.setup_button_size, 1, 1);
+ int bottom = resources.getDimensionPixelSize(R.dimen.setup_item_margin);
+ setPaddingRelative(
+ (int) (parentWidth * sideMargin),
+ 0,
+ (int) (parentWidth * sideMargin),
+ bottom);
+ View title = findViewById(R.id.title_area);
+ if (title != null) {
+ title.setMinimumHeight((int) (parentHeight * titleHeight));
+ }
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+ }
+
+}
diff -urN Android_6.0.1_r11/packages/apps/Settings/src/com/android/settings/collaboroid/RemoteDevice.java SAMD_6.0.1_r11_20170930/packages/apps/Settings/src/com/android/settings/collaboroid/RemoteDevice.java
--- Android_6.0.1_r11/packages/apps/Settings/src/com/android/settings/collaboroid/RemoteDevice.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/src/com/android/settings/collaboroid/RemoteDevice.java 2017-01-29 02:51:09.581782000 +0900
@@ -0,0 +1,106 @@
+package com.android.settings.collaboroid;
+
+import java.util.ArrayList;
+
+import android.content.Context;
+import android.preference.CheckBoxPreference;
+import android.service.devicemanagement.Device;
+
+public class RemoteDevice extends CheckBoxPreference
+{
+ Device device;
+
+ String name;
+ String description;
+
+ ArrayList resources;
+
+ int[] askedResources;
+ int[] allowedResources;
+
+ public RemoteDevice(Context context)
+ {
+ super(context);
+ // TODO Auto-generated constructor stub
+ //setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
+ refresh();
+ }
+
+ public RemoteDevice(Context context, String name, String des, ArrayList resources)
+ {
+ super(context);
+ // TODO Auto-generated constructor stub
+ //setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
+ this.name = name;
+ description = des;
+ this.resources = resources;
+ askedResources = new int[Device.RESOURCE_TYPE_SIZE];
+ allowedResources = new int[Device.RESOURCE_TYPE_SIZE];
+
+ refresh();
+ }
+
+ public RemoteDevice(Context context, Device device, ArrayList resources)
+ {
+ super(context);
+ // TODO Auto-generated constructor stub
+ //setWidgetLayoutResource(R.layout.preference_widget_wifi_signal);
+ this.device = device;
+ this.name = device.deviceName;
+ description = device.idleCpu;
+ this.resources = resources;
+ askedResources = new int[Device.RESOURCE_TYPE_SIZE];
+ allowedResources = new int[Device.RESOURCE_TYPE_SIZE];
+
+ refresh();
+ }
+
+ private void refresh()
+ {
+ setTitle(name);
+ setSummary(description);
+ }
+
+ public void setAllowedResources(int[] resources)
+ {
+ allowedResources = resources;
+ device.setAllowedResources(resources);
+ }
+
+ public void setAskedResources(int[] resources)
+ {
+ askedResources = resources;
+ device.setAskedResources(resources);
+ }
+
+ public int[] getAllowedResources()
+ {
+ return allowedResources;
+ }
+
+ public int[] getAskedResources()
+ {
+ return askedResources;
+ }
+
+ public String toString()
+ {
+ String str, allowed="", asked="";
+
+ for(int resource : askedResources)
+ asked += (resource + " ");
+
+ for(int resource : allowedResources)
+ allowed += (resource + " ");
+
+ str = "name: " + name + " description: " + description + " resources: " + resources.toString() +
+ "\nask: " + asked + "\nallowed: " + allowed;
+
+ return str;
+ }
+
+ public Device getDevice()
+ {
+ return device;
+ }
+}
diff -urN Android_6.0.1_r11/packages/apps/Settings/src/com/android/settings/RequestDialog.java SAMD_6.0.1_r11_20170930/packages/apps/Settings/src/com/android/settings/RequestDialog.java
--- Android_6.0.1_r11/packages/apps/Settings/src/com/android/settings/RequestDialog.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/Settings/src/com/android/settings/RequestDialog.java 2017-03-26 17:35:19.189999000 +0900
@@ -0,0 +1,204 @@
+package com.android.settings;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.KeyguardManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.DialogInterface.OnMultiChoiceClickListener;
+import android.os.Bundle;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
+import android.service.devicemanagement.Device;
+import android.service.devicemanagement.DeviceManager;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.WindowManager;
+
+
+public class RequestDialog extends Activity
+{
+ private Context mContext;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState)
+ {
+ mContext = getApplicationContext();
+
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_dialog);
+
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+ showAlertDialog(getIntent().getStringExtra("deviceName"), getIntent().getIntArrayExtra("resources"));
+ }
+
+
+
+ private void showAlertDialog(String deviceName, int[] resources)
+ {
+ final DeviceManager dm = (DeviceManager)getSystemService(Context.DEVICE_MANAGEMENT_SERVICE);
+
+ KeyguardManager km = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
+ KeyguardManager.KeyguardLock kl = km.newKeyguardLock("MyKeyguardLock");
+ kl.disableKeyguard();
+
+ PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+ WakeLock wakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK| PowerManager.ACQUIRE_CAUSES_WAKEUP
+ | PowerManager.ON_AFTER_RELEASE, "MyWakeLock");
+ wakeLock.acquire();
+
+ final String[] resourceNames = new String[resources.length];
+ final boolean[] isAllowed = new boolean[resources.length];
+ final int[] allowedResources = new int[resources.length];
+
+ final String deviceName2 = deviceName;
+ final int[] resources2 = resources;
+
+ int j = 0;
+
+ for(int i : resources)
+ resourceNames[j++] = i + ": " + Device.ResourceNames[i];
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setTitle(deviceName);
+ //builder.setIcon(R.drawable.icon);
+ //builder.setMessage("Content");
+ builder.setCancelable(false);
+
+ builder.setMultiChoiceItems(resourceNames, isAllowed, new OnMultiChoiceClickListener() {
+
+ @Override
+ public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+ // TODO Auto-generated method stub
+
+ }
+ });
+
+ builder.setPositiveButton("Allow", new OnClickListener() {
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ // TODO Auto-generated method stub
+ Log.d("REQUESTDIALOG", "name: " + resourceNames.toString() + "\nisAllowed" + isAllowed.toString());
+ for(int i=0; i
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/SingleMosaicApp/Android.mk SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/Android.mk
--- Android_6.0.1_r11/packages/apps/SingleMosaicApp/Android.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/Android.mk 2017-09-07 11:38:54.569406000 +0900
@@ -0,0 +1,18 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files) \
+
+LOCAL_PACKAGE_NAME := SingleMosaicApp
+
+LOCAL_STATIC_JAVA_LIBRARIES := mekomosaic
+
+LOCAL_CERTIFICATE := platform
+
+LOCAL_PRIVILEGED_MODULE := true
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_PACKAGE)
+
+include $(CLEAR_VARS)
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/local.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/local.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/resize.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/resize.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_1_1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_1_1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_1_2.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_1_2.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_2_1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_2_1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_2_2.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_2_2.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_2_3.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_2_3.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_3_1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_3_1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_3_2.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_3_2.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_3_3.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_3_3.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_3_4.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_3_4.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_4_1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_4_1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_4_2.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_4_2.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_4_3.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_4_3.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_4_4.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_4_4.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_4_5.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_4_5.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_5_1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_5_1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_5_2.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_5_2.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_5_3.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_5_3.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_5_4.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_5_4.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_5_5.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_5_5.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_5_6.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_5_6.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_6_1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_6_1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_6_2.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_6_2.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_6_3.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_6_3.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_6_4.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_6_4.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_6_5.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_6_5.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_6_6.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_6_6.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_6_7.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_6_7.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_7_1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_7_1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_7_2.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_7_2.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_7_3.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_7_3.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_7_4.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_7_4.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_7_5.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_7_5.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_7_6.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_7_6.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_7_7.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_7_7.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_7_8.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_7_8.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_8_1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_8_1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_8_2.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_8_2.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_8_3.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_8_3.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_8_4.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_8_4.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_8_5.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_8_5.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_8_6.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_8_6.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_8_7.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_8_7.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_8_8.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_8_8.jpg differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/assets/split1_8_9.jpg and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/assets/split1_8_9.jpg differ
diff -urN Android_6.0.1_r11/packages/apps/SingleMosaicApp/build.properties SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/build.properties
--- Android_6.0.1_r11/packages/apps/SingleMosaicApp/build.properties 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/build.properties 2017-02-27 16:07:46.000000000 +0900
@@ -0,0 +1 @@
+external.libs.dir=lib
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/SingleMosaicApp/CleanSpec.mk SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/CleanSpec.mk
--- Android_6.0.1_r11/packages/apps/SingleMosaicApp/CleanSpec.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/CleanSpec.mk 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,49 @@
+# Copyright (C) 2007 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/libs/MekoMosaicLibrary.jar and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/libs/MekoMosaicLibrary.jar differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/res/drawable/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/res/drawable/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/res/drawable-xhdpi/test2.JPG and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/res/drawable-xhdpi/test2.JPG differ
Binary files Android_6.0.1_r11/packages/apps/SingleMosaicApp/res/drawable-xxhdpi/test2.JPG and SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/res/drawable-xxhdpi/test2.JPG differ
diff -urN Android_6.0.1_r11/packages/apps/SingleMosaicApp/res/layout/localdevice.xml SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/res/layout/localdevice.xml
--- Android_6.0.1_r11/packages/apps/SingleMosaicApp/res/layout/localdevice.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/res/layout/localdevice.xml 2017-08-28 00:52:24.000000000 +0900
@@ -0,0 +1,19 @@
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/SingleMosaicApp/res/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/res/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/SingleMosaicApp/res/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/res/values/dimens.xml 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff -urN Android_6.0.1_r11/packages/apps/SingleMosaicApp/res/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/res/values/strings.xml
--- Android_6.0.1_r11/packages/apps/SingleMosaicApp/res/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/res/values/strings.xml 2017-08-28 03:03:09.536635000 +0900
@@ -0,0 +1,56 @@
+
+
+
+
+
+ SingleMosaicApp
+ SingleMosaicApp
+ LocalProcess
+ D 1:1
+ D 1:2
+ D 1:3
+ D 1:4
+ D 1:5
+ D 1:6
+ D 1:7
+ D 1:8
+ Background
+ Single Mosaic
+ Single Mosaic2
+ SelectImage
+ Local
+ Remote
+ ----------
+ split test
+ merge test
+ save bmp
+ split1:1
+ split1:2
+ split1:3
+ split1:4
+ split1:5
+ split1:6
+ split1:7
+ split1:8
+ merge1:1
+ merge1:2
+ merge1:3
+ merge1:4
+ merge1:5
+ merge1:6
+ merge1:7
+ merge1:8
+
diff -urN Android_6.0.1_r11/packages/apps/SingleMosaicApp/src/com/singlemosaic/test/LocalActivity.java SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/src/com/singlemosaic/test/LocalActivity.java
--- Android_6.0.1_r11/packages/apps/SingleMosaicApp/src/com/singlemosaic/test/LocalActivity.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/SingleMosaicApp/src/com/singlemosaic/test/LocalActivity.java 2017-09-07 12:16:35.980339000 +0900
@@ -0,0 +1,294 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.singlemosaic.test;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.ImageView;
+
+import java.util.List;
+
+import dcs.meko.mosaic.mekomosaic.MekoMosaic;
+
+public class LocalActivity extends Activity {
+ //MEKO MOSAIC
+ public Bitmap bm;
+
+ ImageView localimage;
+ MekoMosaic mekoMosaic;
+ @Override
+ protected void onCreate(Bundle icicle) {
+ Log.d("samd experiment", "LocalActivity Show");
+ super.onCreate(icicle);
+ setContentView(R.layout.localdevice);
+
+ Bundle extras = getIntent().getExtras();
+ final String[] arrayB = extras.getStringArray("SAWR");
+
+ localimage = (ImageView)findViewById(R.id.localimage);
+
+ if(arrayB != null){
+ if (arrayB.length!=0){
+ try {
+ bm = BitmapFactory.decodeStream(getAssets().open(arrayB[0]))
+ .copy(Bitmap.Config.ARGB_8888, true);
+ Runtime rt = Runtime.getRuntime();
+ long maxMemory = rt.maxMemory();
+ Log.d("samd experiment","heap max : " + Long.toString(maxMemory));
+ Log.d("samd experiment","size : " + bm.getByteCount());
+
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
+ mekoMosaic = new MekoMosaic(bm);
+ localimage.setImageBitmap(mekoMosaic.bm);
+
+ localimage.post(new Runnable() {
+ @Override
+ public void run() {
+ localimage.setImageBitmap(mekoMosaic.bm);
+ localimage.postDelayed(this, 100);
+ }
+ });
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ boolean send = false;
+ Log.d("samd experiment", "meko Mosaic Start");
+ send = mekoMosaic.MosaicProcess();
+ if(send){
+ Log.d("samd experiment", "meko Mosaic End");
+
+ saveBitmaptoJpeg(mekoMosaic.bm,"mosaicremote", "m_"+arrayB[0].split("\\.")[0]);
+ }
+ }
+ }).start();
+ }
+ }
+ }
+ public boolean fastblur(float scale, int radius) {
+
+ int width = Math.round(bm.getWidth() * scale);
+ int height = Math.round(bm.getHeight() * scale);
+ bm = Bitmap.createScaledBitmap(bm, width, height, false).copy(bm.getConfig().ARGB_8888, true);
+
+
+ if (radius < 1) {
+ Log.d("samd experiment","no radius over 1");
+ }
+
+ int w = bm.getWidth();
+ int h = bm.getHeight();
+
+ int[] pix = new int[w * h];
+ Log.e("pix", w + " " + h + " " + pix.length);
+ bm.getPixels(pix, 0, w, 0, 0, w, h);
+
+ int wm = w - 1;
+ int hm = h - 1;
+ int wh = w * h;
+ int div = radius + radius + 1;
+
+ int r[] = new int[wh];
+ int g[] = new int[wh];
+ int b[] = new int[wh];
+ int rsum, gsum, bsum, x, y, i, p, yp, yi, yw;
+ int vmin[] = new int[Math.max(w, h)];
+
+ int divsum = (div + 1) >> 1;
+ divsum *= divsum;
+ int dv[] = new int[256 * divsum];
+ for (i = 0; i < 256 * divsum; i++) {
+ dv[i] = (i / divsum);
+ }
+
+ yw = yi = 0;
+
+ int[][] stack = new int[div][3];
+ int stackpointer;
+ int stackstart;
+ int[] sir;
+ int rbs;
+ int r1 = radius + 1;
+ int routsum, goutsum, boutsum;
+ int rinsum, ginsum, binsum;
+
+ for (y = 0; y < h; y++) {
+ rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
+ for (i = -radius; i <= radius; i++) {
+ p = pix[yi + Math.min(wm, Math.max(i, 0))];
+ sir = stack[i + radius];
+ sir[0] = (p & 0xff0000) >> 16;
+ sir[1] = (p & 0x00ff00) >> 8;
+ sir[2] = (p & 0x0000ff);
+ rbs = r1 - Math.abs(i);
+ rsum += sir[0] * rbs;
+ gsum += sir[1] * rbs;
+ bsum += sir[2] * rbs;
+ if (i > 0) {
+ rinsum += sir[0];
+ ginsum += sir[1];
+ binsum += sir[2];
+ } else {
+ routsum += sir[0];
+ goutsum += sir[1];
+ boutsum += sir[2];
+ }
+ }
+ stackpointer = radius;
+
+ for (x = 0; x < w; x++) {
+
+ r[yi] = dv[rsum];
+ g[yi] = dv[gsum];
+ b[yi] = dv[bsum];
+
+ rsum -= routsum;
+ gsum -= goutsum;
+ bsum -= boutsum;
+
+ stackstart = stackpointer - radius + div;
+ sir = stack[stackstart % div];
+
+ routsum -= sir[0];
+ goutsum -= sir[1];
+ boutsum -= sir[2];
+
+ if (y == 0) {
+ vmin[x] = Math.min(x + radius + 1, wm);
+ }
+ p = pix[yw + vmin[x]];
+
+ sir[0] = (p & 0xff0000) >> 16;
+ sir[1] = (p & 0x00ff00) >> 8;
+ sir[2] = (p & 0x0000ff);
+
+ rinsum += sir[0];
+ ginsum += sir[1];
+ binsum += sir[2];
+
+ rsum += rinsum;
+ gsum += ginsum;
+ bsum += binsum;
+
+ stackpointer = (stackpointer + 1) % div;
+ sir = stack[(stackpointer) % div];
+
+ routsum += sir[0];
+ goutsum += sir[1];
+ boutsum += sir[2];
+
+ rinsum -= sir[0];
+ ginsum -= sir[1];
+ binsum -= sir[2];
+
+ yi++;
+ }
+ yw += w;
+ }
+ for (x = 0; x < w; x++) {
+ rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
+ yp = -radius * w;
+ for (i = -radius; i <= radius; i++) {
+ yi = Math.max(0, yp) + x;
+
+ sir = stack[i + radius];
+
+ sir[0] = r[yi];
+ sir[1] = g[yi];
+ sir[2] = b[yi];
+
+ rbs = r1 - Math.abs(i);
+
+ rsum += r[yi] * rbs;
+ gsum += g[yi] * rbs;
+ bsum += b[yi] * rbs;
+
+ if (i > 0) {
+ rinsum += sir[0];
+ ginsum += sir[1];
+ binsum += sir[2];
+ } else {
+ routsum += sir[0];
+ goutsum += sir[1];
+ boutsum += sir[2];
+ }
+
+ if (i < hm) {
+ yp += w;
+ }
+ }
+ yi = x;
+ stackpointer = radius;
+ for (y = 0; y < h; y++) {
+ // Preserve alpha channel: ( 0xff000000 & pix[yi] )
+ pix[yi] = ( 0xff000000 & pix[yi] ) | ( dv[rsum] << 16 ) | ( dv[gsum] << 8 ) | dv[bsum];
+
+ rsum -= routsum;
+ gsum -= goutsum;
+ bsum -= boutsum;
+
+ stackstart = stackpointer - radius + div;
+ sir = stack[stackstart % div];
+
+ routsum -= sir[0];
+ goutsum -= sir[1];
+ boutsum -= sir[2];
+
+ if (x == 0) {
+ vmin[y] = Math.min(y + r1, hm) * w;
+ }
+ p = x + vmin[y];
+
+ sir[0] = r[p];
+ sir[1] = g[p];
+ sir[2] = b[p];
+
+ rinsum += sir[0];
+ ginsum += sir[1];
+ binsum += sir[2];
+
+ rsum += rinsum;
+ gsum += ginsum;
+ bsum += binsum;
+
+ stackpointer = (stackpointer + 1) % div;
+ sir = stack[stackpointer];
+
+ routsum += sir[0];
+ goutsum += sir[1];
+ boutsum += sir[2];
+
+ rinsum -= sir[0];
+ ginsum -= sir[1];
+ binsum -= sir[2];
+
+ yi += w;
+ }
+ }
+
+ Log.e("pix", w + " " + h + " " + pix.length);
+ bm.setPixels(pix, 0, w, 0, 0, w, h);
+
+ return true;
+ }
+}
\ No newline at end of file
Binary files Android_6.0.1_r11/packages/apps/SmartCardService/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/SmartCardService/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/SoundRecorder/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/SoundRecorder/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/SpareParts/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/SpareParts/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/SpeechRecorder/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/SpeechRecorder/.git/index differ
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/AndroidManifest.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/AndroidManifest.xml 2017-09-21 15:02:58.401964000 +0900
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/Android.mk SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/Android.mk
--- Android_6.0.1_r11/packages/apps/STexasHoldem/Android.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/Android.mk 2017-09-19 23:29:39.786892000 +0900
@@ -0,0 +1,12 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files) \
+
+LOCAL_PACKAGE_NAME := STexasHoldem
+
+LOCAL_CERTIFICATE := platform
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_PACKAGE)
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/AndroidManifest.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/AndroidManifest.xml 2017-03-06 01:37:29.000000000 +0900
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/a.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/a.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/back2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/back2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/back3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/back3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/back.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/back.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/bluebutton.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/bluebutton.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/board1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/board1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/board2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/board2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_call.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_call.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_die.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_die.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_play.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_play.png differ
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_selector_call.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_selector_call.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_selector_call.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_selector_call.xml 2017-09-19 18:21:25.000000000 +0900
@@ -0,0 +1,32 @@
+
+
+ ]-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_selector_die.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_selector_die.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_selector_die.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/button_selector_die.xml 2017-09-19 18:21:33.000000000 +0900
@@ -0,0 +1,32 @@
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c10.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c10.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c11.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c11.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c12.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c12.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c13.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c13.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c14.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c14.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c4.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c4.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c5.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c5.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c6.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c6.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c7.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c7.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c8.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c8.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/c9.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/c9.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/call1.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/call1.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d10.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d10.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d11.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d11.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d12.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d12.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d13.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d13.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d14.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d14.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d4.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d4.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d5.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d5.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d6.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d6.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d7.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d7.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d8.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d8.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/d9.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/d9.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h10.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h10.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h11.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h11.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h12.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h12.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h13.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h13.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h14.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h14.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h4.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h4.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h5.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h5.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h6.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h6.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h7.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h7.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h8.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h8.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/h9.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/h9.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/logo.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/logo.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/player1.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/player1.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/player2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/player2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/player3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/player3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/player4.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/player4.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/player5.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/player5.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/play.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/play.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/quit.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/quit.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/redbutton.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/redbutton.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s10.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s10.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s11.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s11.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s12.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s12.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s13.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s13.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s14.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s14.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s4.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s4.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s5.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s5.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s6.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s6.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s7.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s7.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s8.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s8.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/s9.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/s9.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/drawable/test.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/drawable/test.png differ
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_board.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_board.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_board.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_board.xml 2017-09-21 17:56:18.057644000 +0900
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_main.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_main.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_main.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_main.xml 2017-09-11 11:24:52.000000000 +0900
@@ -0,0 +1,23 @@
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_player.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_player.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_player.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/activity_player.xml 2017-09-21 16:46:37.634856000 +0900
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/content_board.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/content_board.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/content_board.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/content_board.xml 2016-12-11 18:47:27.000000000 +0900
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/layout_rank.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/layout_rank.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/layout_rank.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/layout_rank.xml 2016-12-12 03:32:19.000000000 +0900
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/layout_winner.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/layout_winner.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/layout/layout_winner.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/layout/layout_winner.xml 2017-06-21 13:48:28.000000000 +0900
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/values/color.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/values/color.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/values/color.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/values/color.xml 2017-09-19 22:35:25.000000000 +0900
@@ -0,0 +1,22 @@
+
+
+
+ #3F51B5
+ #303139
+ #ff4081
+
+ #23A96E
+ #159204
+ #02D8B0
+ #10a54a
+
+ #f14e69
+ #e71235
+ #ea95b0
+ #ec0d2b
+
+ #c7c7c7
+ #5e5e5e
+ #d6cccf
+ #5e5b5c
+
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/values/dimens.xml 2017-09-21 10:59:38.000000000 +0900
@@ -0,0 +1,8 @@
+
+
+ 16dp
+ 16dp
+ 16dp
+ 20dp
+ 20dp
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/values/strings.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/assets/collaboroid/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/assets/collaboroid/values/strings.xml 2017-09-19 14:41:17.000000000 +0900
@@ -0,0 +1,22 @@
+
+ ABCDEEE
+ STexasHoldem
+ Board
+ player
+ BoardActivity
+ resourceAll
+ baksmali
+ modifySmali
+ firstTransfer
+ smali
+ makeResApk
+ replaceClassesDex
+ secondTransfer
+ Call
+ Die
+ Player1
+ Player2
+ Player3
+ Player4
+ Player5
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/CleanSpec.mk SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/CleanSpec.mk
--- Android_6.0.1_r11/packages/apps/STexasHoldem/CleanSpec.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/CleanSpec.mk 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,49 @@
+# Copyright (C) 2007 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/a.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/a.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/back2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/back2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/back3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/back3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/back.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/back.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/bluebutton.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/bluebutton.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/board1.jpg and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/board1.jpg differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/board2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/board2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/button_call.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/button_call.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/button_die.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/button_die.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/button_play.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/button_play.png differ
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/button_selector_call.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/button_selector_call.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/button_selector_call.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/button_selector_call.xml 2017-09-19 18:21:25.767867000 +0900
@@ -0,0 +1,32 @@
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/button_selector_die.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/button_selector_die.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/button_selector_die.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/button_selector_die.xml 2017-09-19 18:21:33.739581000 +0900
@@ -0,0 +1,32 @@
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
\ No newline at end of file
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c10.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c10.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c11.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c11.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c12.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c12.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c13.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c13.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c14.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c14.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c4.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c4.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c5.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c5.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c6.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c6.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c7.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c7.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c8.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c8.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/c9.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/c9.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/call1.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/call1.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d10.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d10.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d11.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d11.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d12.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d12.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d13.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d13.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d14.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d14.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d4.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d4.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d5.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d5.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d6.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d6.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d7.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d7.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d8.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d8.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/d9.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/d9.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h10.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h10.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h11.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h11.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h12.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h12.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h13.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h13.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h14.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h14.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h4.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h4.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h5.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h5.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h6.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h6.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h7.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h7.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h8.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h8.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/h9.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/h9.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/logo.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/logo.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/player1.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/player1.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/player2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/player2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/player3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/player3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/player4.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/player4.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/player5.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/player5.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/play.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/play.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/quit.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/quit.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/redbutton.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/redbutton.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s10.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s10.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s11.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s11.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s12.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s12.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s13.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s13.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s14.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s14.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s2.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s2.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s3.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s3.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s4.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s4.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s5.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s5.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s6.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s6.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s7.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s7.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s8.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s8.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/s9.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/s9.png differ
Binary files Android_6.0.1_r11/packages/apps/STexasHoldem/res/drawable/test.png and SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/drawable/test.png differ
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/activity_board.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/activity_board.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/activity_board.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/activity_board.xml 2017-09-22 00:12:22.043474000 +0900
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/activity_main.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/activity_main.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/activity_main.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/activity_main.xml 2017-09-11 11:24:52.674545000 +0900
@@ -0,0 +1,23 @@
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/activity_player.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/activity_player.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/activity_player.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/activity_player.xml 2017-09-21 16:47:18.849865000 +0900
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/content_board.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/content_board.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/content_board.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/content_board.xml 2016-12-11 18:47:27.000000000 +0900
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/layout_rank.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/layout_rank.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/layout_rank.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/layout_rank.xml 2016-12-12 03:32:19.000000000 +0900
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/layout_winner.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/layout_winner.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/res/layout/layout_winner.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/layout/layout_winner.xml 2017-06-21 13:48:28.000000000 +0900
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/res/values/color.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/values/color.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/res/values/color.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/values/color.xml 2017-09-19 22:35:25.078088000 +0900
@@ -0,0 +1,22 @@
+
+
+
+ #3F51B5
+ #303139
+ #ff4081
+
+ #23A96E
+ #159204
+ #02D8B0
+ #10a54a
+
+ #f14e69
+ #e71235
+ #ea95b0
+ #ec0d2b
+
+ #c7c7c7
+ #5e5e5e
+ #d6cccf
+ #5e5b5c
+
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/res/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/res/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/values/dimens.xml 2017-09-21 10:59:38.671120000 +0900
@@ -0,0 +1,8 @@
+
+
+ 16dp
+ 16dp
+ 16dp
+ 20dp
+ 20dp
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/res/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/values/strings.xml
--- Android_6.0.1_r11/packages/apps/STexasHoldem/res/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/res/values/strings.xml 2017-09-19 14:41:17.894799000 +0900
@@ -0,0 +1,22 @@
+
+ ABCDEEE
+ STexasHoldem
+ Board
+ player
+ BoardActivity
+ resourceAll
+ baksmali
+ modifySmali
+ firstTransfer
+ smali
+ makeResApk
+ replaceClassesDex
+ secondTransfer
+ Call
+ Die
+ Player1
+ Player2
+ Player3
+ Player4
+ Player5
+
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Card.java SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Card.java
--- Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Card.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Card.java 2017-01-29 02:51:10.000000000 +0900
@@ -0,0 +1,121 @@
+package collaboroid.texasholdem.game;
+
+/**
+ * Created by ljhokgo on 2016-12-02.
+ */
+
+public class Card implements Comparable{
+
+ public static final int SUIT_CLUBS = 0;
+ public static final int SUIT_DIAMONDS = 1;
+ public static final int SUIT_HEARTS = 2;
+ public static final int SUIT_SPADES = 3;
+
+ public static final int[] ALL_SUITS = {SUIT_CLUBS,
+ SUIT_DIAMONDS,
+ SUIT_HEARTS,
+ SUIT_SPADES };
+
+ public static final String[] SUITS_NAME = {"c", "d", "h", "s"};
+
+ public static final int RANK_2 = 2;
+ public static final int RANK_3 = 3;
+ public static final int RANK_4 = 4;
+ public static final int RANK_5 = 5;
+ public static final int RANK_6 = 6;
+ public static final int RANK_7 = 7;
+ public static final int RANK_8 = 8;
+ public static final int RANK_9 = 9;
+ public static final int RANK_10 = 10;
+ public static final int RANK_JACK = 11;
+ public static final int RANK_QUEEN = 12;
+ public static final int RANK_KING = 13;
+ public static final int RANK_ACE = 14;
+
+ public static final int[] ALL_RANKS = {
+ RANK_2, RANK_3, RANK_4, RANK_5,
+ RANK_6, RANK_7, RANK_8, RANK_9,
+ RANK_10, RANK_JACK, RANK_QUEEN,
+ RANK_KING, RANK_ACE };
+
+ // Card suit
+ private final int suit;
+ // Card rank
+ private final int rank;
+
+ /**
+ * Card constructur
+ * @param suit The suit of the card
+ * @param rank The rank of the card
+ */
+ public Card(int suit, int rank){
+ this.suit = suit;
+ this.rank = rank;
+ }
+
+ /**
+ * Return the suit of the card
+ * @return The suit of the card
+ */
+ public int getSuit(){
+ return this.suit;
+ }
+
+ public String getSuitName(){
+ return SUITS_NAME[this.suit];
+ }
+
+ /**
+ * Return the rank of the card
+ * @return The rank of the card
+ */
+ public int getRank(){
+ return this.rank;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if(this == obj) return true;
+ if(obj == null || this.getClass() != obj.getClass())
+ return false;
+
+ Card otherCard = (Card) obj;
+
+ return otherCard.getSuit() == this.suit &&
+ otherCard.getRank() == this.rank;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 5;
+ hash = 67 * hash + this.suit;
+ hash = 67 * hash + this.rank;
+ return hash;
+ }
+
+ /**
+ * Define natural ordering for Card objects.
+ * @param o The object to compare the current object with.
+ * @return 1 if greater, -1 if smaller, 0 if equal to the input Card object.
+ */
+ @Override
+ public int compareTo(Card o) {
+ /*int thisValue = HandRanker.getCardValue(this);
+ int otherValue = HandRanker.getCardValue(o);
+
+ if(thisValue > otherValue)
+ return 1;
+ if(thisValue < otherValue)
+ return -1;
+
+ return 0; // Same suit and rank*/
+
+ return this.rank > o.getRank() ? -1 : this.rank == o.getRank() ? 0 : 1;
+ }
+
+ @Override
+ public String toString(){
+ return SUITS_NAME[this.suit] + this.rank;
+ //return "[CARD suit " + this.suit + " Rank " + this.rank + "]";
+ }
+}
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Deck.java SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Deck.java
--- Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Deck.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Deck.java 2017-01-29 02:51:10.000000000 +0900
@@ -0,0 +1,92 @@
+package collaboroid.texasholdem.game;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+
+/**
+ * Created by ljhokgo on 2016-12-04.
+ */
+
+public class Deck {
+
+ // List of Cards in the deck. Fast random access required (<> Set)
+ private final List cards;
+ // Random generator
+ private final Random random;
+
+ /**
+ * Default constructor. Create a Deck that consists of a List of 52 unique
+ * Card objects.
+ */
+ public Deck(){
+ this.cards = new ArrayList<>();
+ for(int i=0; i c){
+ this.cards = new ArrayList<>(new HashSet<>(c));
+ this.random = new Random();
+ }
+
+ /**
+ * This function draws and removes a random card from the deck.
+ * @return The random card that was drawn
+ */
+ public Card drawRandomCard(){
+ return drawRandomCard(true);
+ }
+
+ /**
+ * This function draws and optionally removes a random card from the deck.
+ * Removal depends on the input flag setting.
+ * @param remove True if the card should be removed, false otherwise.
+ * @return The random Card that was drawn from the deck.
+ */
+ public Card drawRandomCard(boolean remove){
+ int randomIndex = this.random.nextInt(this.cards.size());
+ Card selectedCard = this.cards.get(randomIndex);
+
+ if(remove)
+ this.cards.remove(randomIndex);
+
+ return selectedCard;
+ }
+
+ /**
+ * Thie function returns the List of remaining cards in the deck.
+ * @return A list of remaining cards in the deck.
+ */
+ public List getCards(){
+ return this.cards;
+ }
+
+ /**
+ * This function removes a Card from the deck.
+ * @param c The card that must be removed from the deck.
+ */
+ public void removeCard(Card c){
+ this.cards.remove(c);
+ }
+
+ /**
+ * This function return a selected card from the deck. The relevant card
+ * is selected via the input index.
+ * @param i The index of the card that should be returned.
+ * @return The requested card, located at index i.
+ */
+ public Card getCard(int i){
+ return cards.get(i);
+ }
+}
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Hand.java SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Hand.java
--- Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Hand.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Hand.java 2017-01-29 02:51:10.000000000 +0900
@@ -0,0 +1,34 @@
+package collaboroid.texasholdem.game;
+
+import java.util.List;
+
+/**
+ * Created by ljhokgo on 2016-12-04.
+ */
+
+public class Hand {
+ private HandType type;
+ private List fiveCardHand;
+
+ public Hand(HandType type, List fiveCardHand) {
+ super();
+ this.type = type;
+ this.fiveCardHand = fiveCardHand;
+ }
+
+ public HandType getType() {
+ return type;
+ }
+
+ public void setType(HandType type) {
+ this.type = type;
+ }
+
+ public List getFiveCardHand() {
+ return fiveCardHand;
+ }
+
+ public void setFiveCardHand(List fiveCardHand) {
+ this.fiveCardHand = fiveCardHand;
+ }
+}
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/HandType.java SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/HandType.java
--- Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/HandType.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/HandType.java 2017-01-29 02:51:10.000000000 +0900
@@ -0,0 +1,24 @@
+package collaboroid.texasholdem.game;
+
+/**
+ * Created by ljhokgo on 2016-12-04.
+ */
+
+public enum HandType {
+
+ HIGHCARD(1),ONEPAIR(2),TWOPAIR(3),THREEKIND(4),STRAIGHT(5),FLUSH(6),FULLHOUSE(7),FOURKIND(8),STRAIGHTFLUSH(9);
+
+ private int rank;
+
+ private HandType(int rank){
+ this.setRank(rank);
+ }
+
+ public int getRank() {
+ return rank;
+ }
+
+ public void setRank(int rank) {
+ this.rank = rank;
+ }
+}
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/InvalidHandException.java SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/InvalidHandException.java
--- Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/InvalidHandException.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/InvalidHandException.java 2017-01-29 02:51:10.000000000 +0900
@@ -0,0 +1,15 @@
+package collaboroid.texasholdem.game;
+
+/**
+ * Created by ljhokgo on 2016-12-04.
+ */
+
+public class InvalidHandException extends Exception {
+
+ private static final long serialVersionUID = 2313062069699358725L;
+
+ public InvalidHandException(String message) {
+ super(message);
+ }
+
+}
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Player.java SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Player.java
--- Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Player.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/game/Player.java 2017-01-29 02:51:10.000000000 +0900
@@ -0,0 +1,65 @@
+package collaboroid.texasholdem.game;
+
+/**
+ * Created by ljhokgo on 2016-12-04.
+ */
+
+public class Player {
+ private Card c1;
+ private Card c2;
+ private Hand fiveCardHand;
+ private boolean die;
+ private boolean answer;
+ private boolean join;
+ private String name;
+ private int num;
+
+ public Player(Card c1, Card c2) {
+ this.c1 = c1;
+ this.c2 = c2;
+ }
+
+ public void setDie(boolean die) { this.die = die; }
+
+ public boolean getDie() { return this.die; }
+
+ public void setAnswer(boolean answer) { this.answer = answer; }
+
+ public boolean getAnswer() { return this.answer; }
+
+ public void setJoin(boolean join) { this.join = join; }
+
+ public boolean getJoin() { return this.join; }
+
+ public void setName(String name) { this.name = name; }
+
+ public String getName() { return this.name; }
+
+ public void setNum(int num) { this.num = num; }
+
+ public int getNum() { return this.num; }
+
+ public Card getC1() {
+ return c1;
+ }
+
+ public void setC1(Card c1) {
+ this.c1 = c1;
+ }
+
+ public Card getC2() {
+ return c2;
+ }
+
+ public void setC2(Card c2) {
+ this.c2 = c2;
+ }
+
+ public Hand getFiveCardHand() {
+ return fiveCardHand;
+ }
+
+ public void setFiveCardHand(Hand fiveCardHand) {
+ this.fiveCardHand = fiveCardHand;
+ }
+}
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/handranking/CardRankComparator.java SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/handranking/CardRankComparator.java
--- Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/handranking/CardRankComparator.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/handranking/CardRankComparator.java 2017-01-29 02:51:10.000000000 +0900
@@ -0,0 +1,18 @@
+package collaboroid.texasholdem.handranking;
+
+import java.util.Comparator;
+
+import collaboroid.texasholdem.game.Card;
+
+/**
+ * Created by ljhokgo on 2016-12-04.
+ */
+
+public class CardRankComparator implements Comparator {
+
+ @Override
+ public int compare(Card c1, Card c2) {
+ return c1.getRank() > c2.getRank() ? -1 : c1.getRank() == c2.getRank() ? 0 : 1;
+ }
+
+}
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/handranking/HandEvaluator.java SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/handranking/HandEvaluator.java
--- Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/handranking/HandEvaluator.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/handranking/HandEvaluator.java 2017-01-29 02:51:10.000000000 +0900
@@ -0,0 +1,400 @@
+package collaboroid.texasholdem.handranking;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import collaboroid.texasholdem.game.Card;
+import collaboroid.texasholdem.game.Hand;
+import collaboroid.texasholdem.game.HandType;
+import collaboroid.texasholdem.game.InvalidHandException;
+import collaboroid.texasholdem.game.Player;
+
+/**
+ * Created by ljhokgo on 2016-12-04.
+ */
+
+public class HandEvaluator {
+ private static final int HAND_SIZE = 5;
+
+ /**
+ * @param players
+ * @param community
+ * @return
+ * @throws InvalidHandException
+ */
+ public Player evaluateWinner(List players, List community) throws InvalidHandException {
+ Player winner = null;
+ Hand bestHand = null;
+ List sevenCardHand = new ArrayList<>();
+ Comparator sorter = new CardRankComparator();
+
+ for(Player player:players){
+ sevenCardHand.clear();
+ sevenCardHand.addAll(community);
+ sevenCardHand.add(player.getC1());
+ sevenCardHand.add(player.getC2());
+ Collections.sort(sevenCardHand);
+ //sevenCardHand.sort(sorter);
+ if(sevenCardHand.size() == 7){
+ Hand playersHand = null;
+ playersHand = straightFlush(sevenCardHand);
+ if(playersHand == null){
+ playersHand = fourOfAKind(sevenCardHand);
+ if(playersHand == null){
+ playersHand = fullHouse(sevenCardHand);
+ if(playersHand == null){
+ playersHand = flush(sevenCardHand);
+ if(playersHand == null){
+ playersHand = straight(sevenCardHand);
+ if(playersHand == null){
+ playersHand = threeOfAKind(sevenCardHand);
+ if(playersHand == null){
+ playersHand = twoPair(sevenCardHand);
+ if(playersHand == null){
+ playersHand = onePair(sevenCardHand);
+ if(playersHand == null){
+ playersHand = highCard(sevenCardHand);
+ if(playersHand == null){
+ throw new InvalidHandException("Could not find a hand");
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ player.setFiveCardHand(playersHand);
+ if(bestHand == null || playersHand.getType().getRank() > bestHand.getType().getRank()){
+ bestHand = playersHand;
+ winner = player;
+ }
+ else if(playersHand.getType().getRank() == bestHand.getType().getRank()){
+
+ }
+ }
+ }
+ return winner;
+ }
+
+ /**
+ * @param sevenCardHand
+ * @return
+ */
+ private Hand highCard(List sevenCardHand) {
+ List fiveCardHand = new ArrayList<>();
+ for(int i=0;i sevenCardHand) {
+ List fiveCardHand = new ArrayList<>();
+ //find the pair in the seven cards, if it exists
+ for(int i=0;i<=HAND_SIZE;i++){
+ Card c1 = sevenCardHand.get(i);
+ Card c2 = sevenCardHand.get(i+1);
+ if(c1.getRank() == c2.getRank()){
+ fiveCardHand.add(c1);
+ fiveCardHand.add(c2);
+ }
+ }
+ //if a pair was found, fill the rest of the five card hand with high cards
+ if(fiveCardHand.size() > 0){
+ //get the rank of the found pair
+ int pairRank = fiveCardHand.get(0).getRank();
+ for(int i=0;fiveCardHand.size() < HAND_SIZE;i++){
+ Card c = sevenCardHand.get(i);
+ if(c.getRank() != pairRank){
+ fiveCardHand.add(c);
+ }
+ }
+ return new Hand(HandType.ONEPAIR,fiveCardHand);
+ }
+ return null;
+ }
+
+ /**
+ * @param sevenCardHand
+ * @return
+ */
+ private Hand twoPair(List sevenCardHand) {
+ List fiveCardHand = new ArrayList<>();
+ //look for two pairs in the seven cards
+ for(int i=0;i<=HAND_SIZE;i++){
+ Card c1 = sevenCardHand.get(i);
+ Card c2 = sevenCardHand.get(i+1);
+ if(c1.getRank() == c2.getRank()){
+ fiveCardHand.add(c1);
+ fiveCardHand.add(c2);
+ }
+ }
+ /*
+ * There is the possibility that a 3 pair hand could be found
+ * since we are working with 7 cards. e.g. 9963322. In this case
+ * the bottom (lowest pair) should be stripped and the final hand
+ * should be 99633. At this point fiveCardHand should be no larger
+ * than 4
+ */
+ while(fiveCardHand.size() > HAND_SIZE-1){
+ fiveCardHand.remove(fiveCardHand.size()-1);
+ }
+
+ //if two pairs were found, add the first high card found to complete the hand
+ if(fiveCardHand.size() >= HAND_SIZE-1){
+ int topPairRank = fiveCardHand.get(0).getRank();
+ int bottomPairRank = fiveCardHand.get(HAND_SIZE-2).getRank();
+ for(int i=0;fiveCardHand.size() < HAND_SIZE;i++){
+ Card c = sevenCardHand.get(i);
+ if(c.getRank() != topPairRank && c.getRank() != bottomPairRank){
+ fiveCardHand.add(c);
+ }
+ }
+ return new Hand(HandType.TWOPAIR,fiveCardHand);
+ }
+ return null;
+ }
+
+ /**
+ * @param sevenCardHand
+ * @return
+ */
+ private Hand threeOfAKind(List sevenCardHand) {
+ List fiveCardHand = new ArrayList<>();
+ //look for 3 matching cards in the seven cards
+ for(int i=0;i 0){
+ //get the rank of the found set
+ int pairRank = fiveCardHand.get(0).getRank();
+ for(int i=0;fiveCardHand.size() < HAND_SIZE;i++){
+ Card c = sevenCardHand.get(i);
+ if(c.getRank() != pairRank){
+ fiveCardHand.add(c);
+ }
+ }
+ return new Hand(HandType.THREEKIND,fiveCardHand);
+ }
+ return null;
+ }
+
+ /**
+ * @param sevenCardHand
+ * @return
+ */
+ private Hand straight(List sevenCardHand) {
+ List fiveCardHand = new ArrayList<>();
+ for(int i=0;i<=sevenCardHand.size() - HAND_SIZE;i++){
+ Card c1 = sevenCardHand.get(i);
+ Card c2 = sevenCardHand.get(i+1);
+ Card c3 = sevenCardHand.get(i+2);
+ Card c4 = sevenCardHand.get(i+3);
+ Card c5 = sevenCardHand.get(i+4);
+
+ if (c1.getRank() == c2.getRank() + 1
+ && c2.getRank() == c3.getRank() + 1
+ && c3.getRank() == c4.getRank() + 1
+ && c4.getRank() == c5.getRank() + 1) {
+ fiveCardHand.add(c1);
+ fiveCardHand.add(c2);
+ fiveCardHand.add(c3);
+ fiveCardHand.add(c4);
+ fiveCardHand.add(c5);
+ break;
+ }
+ }
+ if(fiveCardHand.size() == HAND_SIZE){
+ return new Hand(HandType.STRAIGHT, fiveCardHand);
+ }
+ return null;
+ }
+
+ /**
+ * @param sevenCardHand
+ * @return
+ */
+ private Hand flush(List sevenCardHand) {
+ List fiveCardSpadeHand = new ArrayList<>();
+ List fiveCardClubHand = new ArrayList<>();
+ List fiveCardDiamondHand = new ArrayList<>();
+ List fiveCardHeartHand = new ArrayList<>();
+ for(Card c : sevenCardHand){
+ String suit = c.getSuitName();
+ if("s".equalsIgnoreCase(suit)){
+ fiveCardSpadeHand.add(c);
+ }
+ else if("c".equalsIgnoreCase(suit)){
+ fiveCardClubHand.add(c);
+ }
+ else if("d".equalsIgnoreCase(suit)){
+ fiveCardDiamondHand.add(c);
+ }
+ else if("h".equalsIgnoreCase(suit)){
+ fiveCardHeartHand.add(c);
+ }
+ }
+ if(fiveCardSpadeHand.size() >= HAND_SIZE){
+ while(fiveCardSpadeHand.size() > HAND_SIZE){
+ fiveCardSpadeHand.remove(fiveCardSpadeHand.size()-1);
+ }
+ return new Hand(HandType.FLUSH,fiveCardSpadeHand);
+ }
+ else if(fiveCardClubHand.size() >= HAND_SIZE){
+ while(fiveCardClubHand.size() > HAND_SIZE){
+ fiveCardClubHand.remove(fiveCardClubHand.size()-1);
+ }
+ return new Hand(HandType.FLUSH,fiveCardClubHand);
+ }
+ else if(fiveCardDiamondHand.size() >= HAND_SIZE){
+ while(fiveCardDiamondHand.size() > HAND_SIZE){
+ fiveCardDiamondHand.remove(fiveCardDiamondHand.size()-1);
+ }
+ return new Hand(HandType.FLUSH,fiveCardDiamondHand);
+ }
+ else if(fiveCardHeartHand.size() >= HAND_SIZE){
+ while(fiveCardHeartHand.size() > HAND_SIZE){
+ fiveCardHeartHand.remove(fiveCardHeartHand.size()-1);
+ }
+ return new Hand(HandType.FLUSH,fiveCardHeartHand);
+ }
+ return null;
+ }
+
+ /**
+ * @param sevenCardHand
+ * @return
+ */
+ private Hand fullHouse(List sevenCardHand) {
+ List fiveCardHand = new ArrayList<>();
+ //look for two pairs in the seven cards
+ for(int i=0;i 0){
+ //get the rank of the found set
+ int setRank = fiveCardHand.get(0).getRank();
+ for(int i=0;i sevenCardHand) {
+ List fiveCardHand = new ArrayList<>();
+ //look for 3 matching cards in the seven cards
+ for(int i=0;i 0){
+ //get the rank of the found set
+ int setRank = fiveCardHand.get(0).getRank();
+ for(int i=0;fiveCardHand.size() < HAND_SIZE;i++){
+ Card c = sevenCardHand.get(i);
+ if(c.getRank() != setRank){
+ fiveCardHand.add(c);
+ }
+ }
+ return new Hand(HandType.FOURKIND,fiveCardHand);
+ }
+ return null;
+ }
+
+ /**
+ * @param sevenCardHand
+ * @return
+ */
+ private Hand straightFlush(List sevenCardHand) {
+ List fiveCardHand = new ArrayList<>();
+ List interest = new ArrayList<>();
+ int h_ct=0, d_ct=0, s_ct=0, c_ct=0;
+ for (int i = 0; i < 7; i++){
+ //find the count of the suits
+ if ("h".equalsIgnoreCase(sevenCardHand.get(i).getSuitName())) h_ct++;
+ else if ("d".equalsIgnoreCase(sevenCardHand.get(i).getSuitName())) d_ct++;
+ else if ("s".equalsIgnoreCase(sevenCardHand.get(i).getSuitName())) s_ct++;
+ else c_ct++;
+ if (i<6){
+ //view ranking
+ if (sevenCardHand.get(i).getRank() == sevenCardHand.get(i+1).getRank()
+ || sevenCardHand.get(i).getRank() == sevenCardHand.get(i+1).getRank() + 1){
+
+ if (interest.size()==0){
+ interest.add(sevenCardHand.get(i));
+ }
+ interest.add(sevenCardHand.get(i+1));
+ }
+ }
+ }
+ if (interest.size()>=5){
+ String suit = "";
+ if (h_ct >= 5) suit = "h";
+ else if (d_ct >= 5) suit = "d";
+ else if (s_ct >= 5) suit = "s";
+ else if (c_ct >= 5) suit = "c";
+ else return null;
+
+ for (int i = 0; i < interest.size() && fiveCardHand.size() < 5; i++){
+ if (suit.equalsIgnoreCase(interest.get(i).getSuitName())){
+ fiveCardHand.add(interest.get(i));
+ }
+ }
+ }
+ if (fiveCardHand.size()==5){
+ return new Hand(HandType.STRAIGHTFLUSH,fiveCardHand);
+ }
+ return null;
+
+ }
+}
diff -urN Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/sactivities/BoardActivity.java SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/sactivities/BoardActivity.java
--- Android_6.0.1_r11/packages/apps/STexasHoldem/src/collaboroid/texasholdem/sactivities/BoardActivity.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/STexasHoldem/src/collaboroid/texasholdem/sactivities/BoardActivity.java 2017-09-22 03:13:29.213350000 +0900
@@ -0,0 +1,511 @@
+package collaboroid.texasholdem.sactivities;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.app.Activity;
+import android.service.samd.SAMDManager;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import collaboroid.texasholdem.game.Card;
+import collaboroid.texasholdem.game.Deck;
+import collaboroid.texasholdem.game.InvalidHandException;
+import collaboroid.texasholdem.game.Player;
+import collaboroid.texasholdem.handranking.HandEvaluator;
+
+public class BoardActivity extends Activity implements android.service.samd.SAMDListener {
+
+ int ROUND_OVER = 4;
+ int ROUND_CURRENT = 0;
+ boolean ROUND_TURN = false;
+
+ int TOTAL_CARD_COUNT = 100;
+
+ int PLAYER_COUNT = 0;
+ int PLAYER_CURRENT = 0;
+
+ int CURRENT_PLAYER_ID = 0;
+
+ int DRAW_COUNT = 1;
+ // card imageView ids
+ int ivCardIds[] = {R.id.imageCard1,
+ R.id.imageCard2, R.id.imageCard3,
+ R.id.imageCard4, R.id.imageCard5};
+
+ int playingIds[] = {R.id.playing1,
+ R.id.playing2 ,R.id.playing3,
+ R.id.playing4};
+
+ int playerIds[] = {R.id.player1, R.id.player2, R.id.player3, R.id.player4};
+ ImageView ivCard[] = new ImageView[5];
+ TextView tvPlayer[];
+ TextView tvPlaying[];
+ //TextView tvTest[] = new TextView[testCardIds.length];
+
+ Deck deck;
+ //Card players[][] = new Card[PLAYER_COUNT][2];
+ List communityCards = new ArrayList<>();
+ //Player players[] = new Player[PLAYER_COUNT];
+ //List players = new ArrayList<>();
+ HashMap players = new HashMap<>();
+ HandEvaluator evaluator;
+
+ Context context;
+ PopupWindow mWinnerPW;
+ RelativeLayout mLayout;
+
+ SAMDManager manager;
+
+ protected void onCreate(Bundle savedInstanceState) {
+ // remove title (line을 삭제하는것만으로 충분하다.)
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
+ // 만약, 개발자가 action bar없이 full screen을 원하는 경우에는 다음을 추가한다
+ getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+ WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_board);
+
+ manager = new SAMDManager(getApplicationContext());
+ manager.registerSAMDListener(this);
+
+ PLAYER_COUNT = manager.getRemoteDeviceCount();
+ tvPlayer = new TextView[PLAYER_COUNT];
+ tvPlaying = new TextView[PLAYER_COUNT];
+
+ mLayout = (RelativeLayout) findViewById(R.id.activity_board);
+ context = getApplicationContext();
+ evaluator = new HandEvaluator();
+
+ ImageButton btn1 = (ImageButton)findViewById(R.id.btn1);
+ btn1.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ playing(PLAYER_CURRENT);
+ manager.sendMessageToRemote(PLAYER_CURRENT,"yourturn");
+ }
+ });
+ ImageButton btn2 = (ImageButton)findViewById(R.id.btn2);
+ btn2.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ finish();
+ }
+ });
+
+ for (int i = 0; i < 5; i++){
+ ivCard[i] = (ImageView) findViewById(ivCardIds[i]);
+ }
+
+
+ /*
+ tvTest[0] = (TextView)findViewById(R.id.testCard1);
+ tvTest[1] = (TextView)findViewById(R.id.testCard2);
+ tvTest[2] = (TextView)findViewById(R.id.testCard3);
+
+ Button btn1 = (Button)findViewById(R.id.btn1);
+ Button btn5 = (Button)findViewById(R.id.btn5);
+
+ btn4.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ drawCommunityCards(1);
+ drawCommunityCards(2);
+ }
+ });
+
+ btn5.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ //endGame();
+ //unregisterReceiver(mReceiver);
+ RemoteServiceManager rsm = (RemoteServiceManager)getSystemService(Context.REMOTE_SERVICE);
+ rsm.sendToRemoteActivityClient("yourturn", 0);
+ Log.d("Player", 0 + "Player Go!!");
+ }
+ });*/
+
+ try {
+ Thread.sleep(2000);
+ }catch(Exception e) {
+
+ }
+
+ startGame();
+ //test();
+ }
+
+ public void test(){
+ for(int i=0; i<4; i++){
+ tvPlayer[i] = (TextView)findViewById(playerIds[i]);
+ tvPlaying[i] = (TextView)findViewById(playingIds[i]);
+ }
+ for(int i=0; i<3; i++){
+ tvPlayer[i].append("call \n");
+ }
+ tvPlayer[0].append("call \n");
+ tvPlayer[3].append("die \n");
+ tvPlaying[1].append("playing..");
+
+ tvPlayer[3].setTextColor(Color.RED);
+ }
+
+ public void startGame()
+ {
+ players.clear();
+ communityCards.clear();
+ deck = new Deck();
+ Player player;
+ Card card1, card2;
+
+
+ Log.d("sbjsbj","sbjsbj : " + PLAYER_COUNT);
+
+ for(int i=0; i
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/TestApp/Android.mk SAMD_6.0.1_r11_20170930/packages/apps/TestApp/Android.mk
--- Android_6.0.1_r11/packages/apps/TestApp/Android.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/Android.mk 2017-07-27 15:59:43.000000000 +0900
@@ -0,0 +1,16 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files) \
+
+LOCAL_PACKAGE_NAME := TestApp
+
+LOCAL_CERTIFICATE := platform
+
+LOCAL_PRIVILEGED_MODULE := true
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_PACKAGE)
+
+include $(CLEAR_VARS)
\ No newline at end of file
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/a1.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/a1.png differ
diff -urN Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/AndroidManifest.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/AndroidManifest.xml
--- Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/AndroidManifest.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/AndroidManifest.xml 2017-03-17 02:08:16.000000000 +0900
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/drawable/a.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/drawable/a.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/drawable/b.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/drawable/b.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/drawable/c.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/drawable/c.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/drawable/d.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/drawable/d.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/drawable/e.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/drawable/e.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/drawable/f.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/drawable/f.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/drawable/g.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/drawable/g.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/drawable/h.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/drawable/h.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/drawable/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/drawable/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/drawable/j.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/drawable/j.png differ
diff -urN Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/layout/activity_a.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/layout/activity_a.xml
--- Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/layout/activity_a.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/layout/activity_a.xml 2017-03-09 11:56:07.000000000 +0900
@@ -0,0 +1,31 @@
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/layout/activity_b.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/layout/activity_b.xml
--- Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/layout/activity_b.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/layout/activity_b.xml 2017-09-22 01:57:51.378546000 +0900
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/layout/activity_c.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/layout/activity_c.xml
--- Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/layout/activity_c.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/layout/activity_c.xml 2017-09-22 01:58:06.933565000 +0900
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/values/dimens.xml 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff -urN Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/values/strings.xml
--- Android_6.0.1_r11/packages/apps/TestApp/assets/collaboroid/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/collaboroid/values/strings.xml 2017-07-26 12:46:11.000000000 +0900
@@ -0,0 +1,55 @@
+
+
+
+
+
+ TestApp
+ Speech Recorder
+ Test
+ Baksmali
+ Smali
+ Redo
+ Server
+ Main Send
+ A Send
+ B Send
+ C Send
+ D Send
+ E Send
+ F Send
+ G Send
+ H Send
+ I Send
+ J Send
+ ABCDEEE
+ A
+ B
+ C
+ D
+ E
+ F
+ G
+ H
+ I
+ J
+ device1
+ device2
+ device3
+ Resource Send
+ Request Send
+ dummy1
+ dummy2
+
Binary files Android_6.0.1_r11/packages/apps/TestApp/assets/star.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/assets/star.png differ
diff -urN Android_6.0.1_r11/packages/apps/TestApp/build.properties SAMD_6.0.1_r11_20170930/packages/apps/TestApp/build.properties
--- Android_6.0.1_r11/packages/apps/TestApp/build.properties 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/build.properties 2017-02-27 16:07:46.000000000 +0900
@@ -0,0 +1 @@
+external.libs.dir=lib
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/TestApp/CleanSpec.mk SAMD_6.0.1_r11_20170930/packages/apps/TestApp/CleanSpec.mk
--- Android_6.0.1_r11/packages/apps/TestApp/CleanSpec.mk 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/CleanSpec.mk 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,49 @@
+# Copyright (C) 2007 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
Binary files Android_6.0.1_r11/packages/apps/TestApp/res/drawable/a.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/drawable/a.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/res/drawable/b.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/drawable/b.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/res/drawable/c.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/drawable/c.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/res/drawable/d.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/drawable/d.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/res/drawable/e.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/drawable/e.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/res/drawable/f.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/drawable/f.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/res/drawable/g.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/drawable/g.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/res/drawable/h.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/drawable/h.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/res/drawable/ic_launcher.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/drawable/ic_launcher.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/res/drawable/i.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/drawable/i.png differ
Binary files Android_6.0.1_r11/packages/apps/TestApp/res/drawable/j.png and SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/drawable/j.png differ
diff -urN Android_6.0.1_r11/packages/apps/TestApp/res/layout/activity_a.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/layout/activity_a.xml
--- Android_6.0.1_r11/packages/apps/TestApp/res/layout/activity_a.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/layout/activity_a.xml 2017-07-26 11:57:32.000000000 +0900
@@ -0,0 +1,30 @@
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/TestApp/res/layout/activity_b.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/layout/activity_b.xml
--- Android_6.0.1_r11/packages/apps/TestApp/res/layout/activity_b.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/layout/activity_b.xml 2017-07-27 23:55:57.000000000 +0900
@@ -0,0 +1,28 @@
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/TestApp/res/layout/activity_c.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/layout/activity_c.xml
--- Android_6.0.1_r11/packages/apps/TestApp/res/layout/activity_c.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/layout/activity_c.xml 2017-07-27 23:55:57.000000000 +0900
@@ -0,0 +1,28 @@
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/TestApp/res/layout/activity_main.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/layout/activity_main.xml
--- Android_6.0.1_r11/packages/apps/TestApp/res/layout/activity_main.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/layout/activity_main.xml 2017-07-26 11:59:56.000000000 +0900
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -urN Android_6.0.1_r11/packages/apps/TestApp/res/values/dimens.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/values/dimens.xml
--- Android_6.0.1_r11/packages/apps/TestApp/res/values/dimens.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/values/dimens.xml 2016-10-31 18:00:43.000000000 +0900
@@ -0,0 +1,5 @@
+
+
+ 16dp
+ 16dp
+
diff -urN Android_6.0.1_r11/packages/apps/TestApp/res/values/strings.xml SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/values/strings.xml
--- Android_6.0.1_r11/packages/apps/TestApp/res/values/strings.xml 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/res/values/strings.xml 2017-07-26 12:46:07.000000000 +0900
@@ -0,0 +1,55 @@
+
+
+
+
+
+ TestApp
+ Speech Recorder
+ Test
+ Baksmali
+ Smali
+ Redo
+ Server
+ Main Send
+ A Send
+ B Send
+ C Send
+ D Send
+ E Send
+ F Send
+ G Send
+ H Send
+ I Send
+ J Send
+ ABCDEEE
+ A
+ B
+ C
+ D
+ E
+ F
+ G
+ H
+ I
+ J
+ device1
+ device2
+ device3
+ Resource Send
+ Request Send
+ dummy1
+ dummy2
+
diff -urN Android_6.0.1_r11/packages/apps/TestApp/src/com/android/test/MainActivity.java SAMD_6.0.1_r11_20170930/packages/apps/TestApp/src/com/android/test/MainActivity.java
--- Android_6.0.1_r11/packages/apps/TestApp/src/com/android/test/MainActivity.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/src/com/android/test/MainActivity.java 2017-09-22 01:17:27.705652000 +0900
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.test;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.*;
+
+import android.service.samd.SAMDListener;
+import android.service.samd.SAMDManager;
+import android.service.samd.SAMDMessage;
+import android.util.Log;
+import android.view.View;
+import android.widget.*;
+import android.os.Bundle;
+
+import java.io.IOException;
+
+public class MainActivity extends Activity{
+ private static final String TAG = "TestApp";
+
+ Button btn_a, btn_b, btn_c, btn_d, btn_e, btn_f, btn_g, btn_h, btn_i, btn_j;
+ Context mContext;
+
+ SAMDManager S;
+ @Override
+ protected void onCreate(Bundle icicle) {
+
+ super.onCreate(icicle);
+ setContentView(R.layout.activity_main);
+
+ S = new SAMDManager(getApplicationContext());
+
+
+ btn_a = (Button) findViewById(R.id.btn_a);
+ btn_a.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd profiling", "button click");
+
+ S.launchActivity("SBJ_A");
+
+ }
+ });
+
+ btn_b = (Button) findViewById(R.id.btn_b);
+ btn_b.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd profiling", "button click");
+ S.launchActivity("SBJ_B");
+ }
+ });
+
+ btn_c = (Button) findViewById(R.id.btn_c);
+ btn_c.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ Log.d("samd profiling", "button click");
+ S.launchActivity("SBJ_C");
+ }
+ });
+
+
+
+ }
+
+}
\ No newline at end of file
diff -urN Android_6.0.1_r11/packages/apps/TestApp/src/com/android/test/SBJ_A.java SAMD_6.0.1_r11_20170930/packages/apps/TestApp/src/com/android/test/SBJ_A.java
--- Android_6.0.1_r11/packages/apps/TestApp/src/com/android/test/SBJ_A.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/src/com/android/test/SBJ_A.java 2017-09-22 01:12:55.955867000 +0900
@@ -0,0 +1,60 @@
+package com.android.test;
+
+import android.app.Activity;
+import android.content.res.AssetManager;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.service.samd.SAMDListener;
+import android.service.samd.SAMDManager;
+import android.service.samd.SAMDMessage;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.ImageView;
+import android.content.*;
+import android.widget.Toast;
+
+import com.android.test.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Created by sbj on 11/17/16.
+ */
+public class SBJ_A extends Activity{
+ private static final String TAG = "Dummy2";
+ ImageView ivCard1;
+ Context mContext;
+ SAMDManager manager;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ Log.d("samd profiling", "SBJ_A Show start");
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_a);
+ mContext = getApplicationContext();
+ manager = new SAMDManager(mContext);
+
+ TextView tv = (TextView)findViewById(R.id.textView_a);
+ tv.setText("A Card");
+
+ Button btn_a = (Button)findViewById(R.id.btn_a);
+ btn_a.setText("A Button");
+ btn_a.setOnClickListener(new Button.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // TODO Auto-generated method stub
+ }
+ });
+
+ ivCard1 = (ImageView)findViewById(R.id.imageView_a);
+ Log.d("samd profiling", "ivCard1 Show start");
+ ivCard1.setImageResource("a1.png");
+
+ }
+
+
+
+}
diff -urN Android_6.0.1_r11/packages/apps/TestApp/src/com/android/test/SBJ_B.java SAMD_6.0.1_r11_20170930/packages/apps/TestApp/src/com/android/test/SBJ_B.java
--- Android_6.0.1_r11/packages/apps/TestApp/src/com/android/test/SBJ_B.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/src/com/android/test/SBJ_B.java 2017-09-22 01:15:03.540898000 +0900
@@ -0,0 +1,54 @@
+package com.android.test;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.service.samd.SAMDListener;
+import android.service.samd.SAMDManager;
+import android.service.samd.SAMDMessage;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.android.test.*;
+
+
+/**
+ * Created by sbj on 11/17/16.
+ */
+public class SBJ_B extends Activity {
+ private static final String TAG = "Dummy2";
+ ImageView ivCard1;
+ Context mContext;
+ SAMDManager manager;
+ @Override
+ protected void onCreate(Bundle icicle) {
+ Log.d("samd profiling", "SBJ_B Show");
+ super.onCreate(icicle);
+ mContext = getApplicationContext();
+ manager = new SAMDManager(mContext);
+ setContentView(R.layout.activity_b);
+
+ TextView tv = (TextView)findViewById(R.id.textView_b);
+ tv.setText("B Card");
+
+ Button btn = (Button)findViewById(R.id.btn_b);
+ btn.setText("B Button");
+ btn.setOnClickListener(new Button.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ // TODO Auto-generated method stub
+ }
+ });
+
+ ivCard1 = (ImageView)findViewById(R.id.imageView_b);
+ Log.d("testtesttesttesttesttesttesttesttesttesttesttest",
+ "testtesttesttesttesttesttesttesttesttesttesttesttesttesttesttest");
+ ivCard1.setImageResource("b.png");
+ Log.d(TAG, "SECOND DUMMY!");
+ }
+}
diff -urN Android_6.0.1_r11/packages/apps/TestApp/src/com/android/test/SBJ_C.java SAMD_6.0.1_r11_20170930/packages/apps/TestApp/src/com/android/test/SBJ_C.java
--- Android_6.0.1_r11/packages/apps/TestApp/src/com/android/test/SBJ_C.java 1970-01-01 09:00:00.000000000 +0900
+++ SAMD_6.0.1_r11_20170930/packages/apps/TestApp/src/com/android/test/SBJ_C.java 2017-09-22 01:14:59.708754000 +0900
@@ -0,0 +1,53 @@
+package com.android.test;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.service.samd.SAMDListener;
+import android.service.samd.SAMDManager;
+import android.service.samd.SAMDMessage;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.android.test.*;
+
+/**
+ * Created by sbj on 11/17/16.
+ */
+public class SBJ_C extends Activity {
+ private static final String TAG = "Dummy2";
+ ImageView ivCard1;
+ Context mContext;
+ SAMDManager manager;
+ @Override
+ protected void onCreate(Bundle icicle) {
+ Log.d("samd profiling", "SBJ_C Show");
+ super.onCreate(icicle);
+ setContentView(R.layout.activity_c);
+ mContext = getApplicationContext();
+ manager = new SAMDManager(mContext);
+ //setContentView2("res/layout/activity_c.xml");
+ TextView tv = (TextView)findViewById(R.id.textView_c);
+ //TextView tv = (TextView)findViewById("textView_c");
+ tv.setText("C Card");
+ Button btn = (Button)findViewById(R.id.btn_c);
+ //Button btn = (Button)findViewById("btn_c");
+ btn.setText("C Button");
+ btn.setOnClickListener(new Button.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // TODO Auto-generated method stub
+ }
+ });
+
+ ivCard1 = (ImageView)findViewById(R.id.imageView_c);
+ Log.d("testtesttesttesttesttesttesttesttesttesttesttest",
+ "testtesttesttesttesttesttesttesttesttesttesttesttesttesttesttest");
+ ivCard1.setImageResource("c.png");
+ Log.d(TAG, "SECOND DUMMY!");
+ }
+}
Binary files Android_6.0.1_r11/packages/apps/TvSettings/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/TvSettings/.git/index differ
Binary files Android_6.0.1_r11/packages/apps/UnifiedEmail/.git/index and SAMD_6.0.1_r11_20170930/packages/apps/UnifiedEmail/.git/index differ
Binary files Android_6.0.1_r11/packages/experimental/.git/index and SAMD_6.0.1_r11_20170930/packages/experimental/.git/index differ
Binary files Android_6.0.1_r11/packages/inputmethods/LatinIME/.git/index and SAMD_6.0.1_r11_20170930/packages/inputmethods/LatinIME/.git/index differ
Binary files Android_6.0.1_r11/packages/inputmethods/OpenWnn/.git/index and SAMD_6.0.1_r11_20170930/packages/inputmethods/OpenWnn/.git/index differ
Binary files Android_6.0.1_r11/packages/providers/ApplicationsProvider/.git/index and SAMD_6.0.1_r11_20170930/packages/providers/ApplicationsProvider/.git/index differ
Binary files Android_6.0.1_r11/packages/providers/BookmarkProvider/.git/index and SAMD_6.0.1_r11_20170930/packages/providers/BookmarkProvider/.git/index differ
Binary files Android_6.0.1_r11/packages/providers/CalendarProvider/.git/index and SAMD_6.0.1_r11_20170930/packages/providers/CalendarProvider/.git/index differ
Binary files Android_6.0.1_r11/packages/providers/CallLogProvider/.git/index and SAMD_6.0.1_r11_20170930/packages/providers/CallLogProvider/.git/index differ
Binary files Android_6.0.1_r11/packages/providers/ContactsProvider/.git/index and SAMD_6.0.1_r11_20170930/packages/providers/ContactsProvider/.git/index differ
Binary files Android_6.0.1_r11/packages/providers/DownloadProvider/.git/index and SAMD_6.0.1_r11_20170930/packages/providers/DownloadProvider/.git/index differ
Binary files Android_6.0.1_r11/packages/providers/MediaProvider/.git/index and SAMD_6.0.1_r11_20170930/packages/providers/MediaProvider/.git/index differ
Binary files Android_6.0.1_r11/packages/providers/PartnerBookmarksProvider/.git/index and SAMD_6.0.1_r11_20170930/packages/providers/PartnerBookmarksProvider/.git/index differ
Binary files Android_6.0.1_r11/packages/providers/TelephonyProvider/.git/index and SAMD_6.0.1_r11_20170930/packages/providers/TelephonyProvider/.git/index differ
Binary files Android_6.0.1_r11/packages/providers/TvProvider/.git/index and SAMD_6.0.1_r11_20170930/packages/providers/TvProvider/.git/index differ
Binary files Android_6.0.1_r11/packages/providers/UserDictionaryProvider/.git/index and SAMD_6.0.1_r11_20170930/packages/providers/UserDictionaryProvider/.git/index differ
Binary files Android_6.0.1_r11/packages/screensavers/Basic/.git/index and SAMD_6.0.1_r11_20170930/packages/screensavers/Basic/.git/index differ
Binary files Android_6.0.1_r11/packages/screensavers/PhotoTable/.git/index and SAMD_6.0.1_r11_20170930/packages/screensavers/PhotoTable/.git/index differ
Binary files Android_6.0.1_r11/packages/screensavers/WebView/.git/index and SAMD_6.0.1_r11_20170930/packages/screensavers/WebView/.git/index differ
Binary files Android_6.0.1_r11/packages/services/Mms/.git/index and SAMD_6.0.1_r11_20170930/packages/services/Mms/.git/index differ
Binary files Android_6.0.1_r11/packages/services/Telecomm/.git/index and SAMD_6.0.1_r11_20170930/packages/services/Telecomm/.git/index differ
Binary files Android_6.0.1_r11/packages/services/Telephony/.git/index and SAMD_6.0.1_r11_20170930/packages/services/Telephony/.git/index differ
Binary files Android_6.0.1_r11/packages/wallpapers/Basic/.git/index and SAMD_6.0.1_r11_20170930/packages/wallpapers/Basic/.git/index differ
Binary files Android_6.0.1_r11/packages/wallpapers/Galaxy4/.git/index and SAMD_6.0.1_r11_20170930/packages/wallpapers/Galaxy4/.git/index differ
Binary files Android_6.0.1_r11/packages/wallpapers/HoloSpiral/.git/index and SAMD_6.0.1_r11_20170930/packages/wallpapers/HoloSpiral/.git/index differ
Binary files Android_6.0.1_r11/packages/wallpapers/LivePicker/.git/index and SAMD_6.0.1_r11_20170930/packages/wallpapers/LivePicker/.git/index differ
Binary files Android_6.0.1_r11/packages/wallpapers/MagicSmoke/.git/index and SAMD_6.0.1_r11_20170930/packages/wallpapers/MagicSmoke/.git/index differ
Binary files Android_6.0.1_r11/packages/wallpapers/NoiseField/.git/index and SAMD_6.0.1_r11_20170930/packages/wallpapers/NoiseField/.git/index differ
Binary files Android_6.0.1_r11/packages/wallpapers/PhaseBeam/.git/index and SAMD_6.0.1_r11_20170930/packages/wallpapers/PhaseBeam/.git/index differ