Update prebuilts for Android samples

Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.

Change-Id: Icba85cdb6246b3fc11a72a20b10cd2658c5f42d7
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/build.gradle b/prebuilts/gradle/ActionBarCompat-Basic/Application/build.gradle
index 39b494b..1887140 100644
--- a/prebuilts/gradle/ActionBarCompat-Basic/Application/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-Basic/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:gridlayout-v7:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
     compile "com.android.support:appcompat-v7:21.0.2"
 }
 
@@ -34,7 +31,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
index 8c1b2be..767dbbb 100644
--- a/prebuilts/gradle/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
+++ b/prebuilts/gradle/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private BasicFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (BasicFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/ActionBarCompat-Basic/README.md b/prebuilts/gradle/ActionBarCompat-Basic/README.md
index 151e91e..821deee 100644
--- a/prebuilts/gradle/ActionBarCompat-Basic/README.md
+++ b/prebuilts/gradle/ActionBarCompat-Basic/README.md
@@ -35,7 +35,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/build.gradle b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/build.gradle
index 39b494b..1887140 100644
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:gridlayout-v7:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
     compile "com.android.support:appcompat-v7:21.0.2"
 }
 
@@ -34,7 +31,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
index c91ae2e..adc025a 100644
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,7 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private ListPopupMenuFragment mTestFragment;
+    private PopupListFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +40,8 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (ListPopupMenuFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
+        mTestFragment = (PopupListFragment)
+            mTestActivity.getSupportFragmentManager().getFragments().get(0);
     }
 
     /**
@@ -76,4 +58,4 @@
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/README.md b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/README.md
index 5a366eb..ef9581f 100644
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/README.md
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/README.md
@@ -17,7 +17,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/build.gradle b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/build.gradle
index 39b494b..1887140 100644
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:gridlayout-v7:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
     compile "com.android.support:appcompat-v7:21.0.2"
 }
 
@@ -34,7 +31,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
index e655bcf..2d56881 100644
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private ShareActionProviderFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (ShareActionProviderFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/README.md b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/README.md
index 25f5aba..82ff02e 100644
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/README.md
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/README.md
@@ -22,7 +22,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/.google/packaging.yaml b/prebuilts/gradle/ActionBarCompat-Styled/.google/packaging.yaml
index 94ef768..f09aee8 100644
--- a/prebuilts/gradle/ActionBarCompat-Styled/.google/packaging.yaml
+++ b/prebuilts/gradle/ActionBarCompat-Styled/.google/packaging.yaml
@@ -5,8 +5,12 @@
 ---
 status:       PUBLISHED
 technologies: [Android]
-categories:   [UI]
+categories:   [ActionBar]
 languages:    [Java]
 solutions:    [Mobile]
 github:       android-ActionBarCompat-Styled
+level:        INTERMEDIATE
+icon:         screenshots/big_icon.png
+apiRefs:
+    - android:android.support.v7.app.ActionBarActivity
 license: apache2
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/build.gradle b/prebuilts/gradle/ActionBarCompat-Styled/Application/build.gradle
index 8a24c4d..65597ef 100644
--- a/prebuilts/gradle/ActionBarCompat-Styled/Application/build.gradle
+++ b/prebuilts/gradle/ActionBarCompat-Styled/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:gridlayout-v7:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
     compile "com.android.support:appcompat-v7:18.0.+"
 }
 
@@ -34,7 +31,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
index 204afdc..1e99f20 100644
--- a/prebuilts/gradle/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
+++ b/prebuilts/gradle/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private StyledFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (StyledFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/README.md b/prebuilts/gradle/ActionBarCompat-Styled/README.md
index c7fff81..3108018 100644
--- a/prebuilts/gradle/ActionBarCompat-Styled/README.md
+++ b/prebuilts/gradle/ActionBarCompat-Styled/README.md
@@ -1,16 +1,36 @@
 Android ActionBarCompat-Styled Sample
 ===================================
 
-This sample shows you how to use ActionBarCompat with a customized theme. It utilizes a
-split action bar when running on a device with a narrow display, and show three tabs.
+This sample shows you how to use ActionBarCompat with a customized theme. It utilizes a 
+split action bar when running on a device with a narrow display, and shows three tabs.
+
+Introduction
+------------
+
+This sample shows how to style an ActionBar using the [support library][1] on devices running 
+Android v2.1+ using a custom theme.
+
+This Activity extends from ActionBarActivity, which provides all of the function 
+necessary to display a compatible Action Bar on devices running Android v2.1+.
+A custom application theme and styles are defined in XML.
+
+Assets have been generated using the ['Android Action Bar Style Generator'][2].
+
+[1]: http://developer.android.com/tools/support-library/
+[2]: http://jgilfelt.github.io/android-actionbarstylegenerator
 
 Pre-requisites
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
+Screenshots
+-------------
+
+<img src="screenshots/1-activity.png" height="400" alt="Screenshot"/> 
+
 Getting Started
 ---------------
 
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/screenshots/1-activity.png.png b/prebuilts/gradle/ActionBarCompat-Styled/screenshots/1-activity.png.png
new file mode 100644
index 0000000..6977143
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-Styled/screenshots/1-activity.png.png
Binary files differ
diff --git a/prebuilts/gradle/ActionBarCompat-Styled/screenshots/big_icon.png b/prebuilts/gradle/ActionBarCompat-Styled/screenshots/big_icon.png
new file mode 100644
index 0000000..5939283
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-Styled/screenshots/big_icon.png
Binary files differ
diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/build.gradle b/prebuilts/gradle/ActivityInstrumentation/Application/build.gradle
index 76169de..e1be69a 100644
--- a/prebuilts/gradle/ActivityInstrumentation/Application/build.gradle
+++ b/prebuilts/gradle/ActivityInstrumentation/Application/build.gradle
@@ -14,11 +14,8 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -31,7 +28,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 4
diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/ActivityInstrumentation/README.md b/prebuilts/gradle/ActivityInstrumentation/README.md
index fe85e8a..1229fcc 100644
--- a/prebuilts/gradle/ActivityInstrumentation/README.md
+++ b/prebuilts/gradle/ActivityInstrumentation/README.md
@@ -8,7 +8,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/build.gradle b/prebuilts/gradle/ActivitySceneTransitionBasic/Application/build.gradle
index c2ac02c..ea57c2e 100644
--- a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/build.gradle
+++ b/prebuilts/gradle/ActivitySceneTransitionBasic/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
     compile "com.squareup.picasso:picasso:2.4.0"
 }
 
@@ -34,7 +31,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java b/prebuilts/gradle/ActivitySceneTransitionBasic/Application/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java
index f06d1ae..09dd1a1 100644
--- a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java
+++ b/prebuilts/gradle/ActivitySceneTransitionBasic/Application/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java
@@ -25,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private ActivitySceneTransitionBasicFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -40,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (ActivitySceneTransitionBasicFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -51,7 +48,6 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/README.md b/prebuilts/gradle/ActivitySceneTransitionBasic/README.md
index b535cb0..3d32f1f 100644
--- a/prebuilts/gradle/ActivitySceneTransitionBasic/README.md
+++ b/prebuilts/gradle/ActivitySceneTransitionBasic/README.md
@@ -19,7 +19,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index a998a4c..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.adaptertransition"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme">
-        <activity
-            android:name="com.example.android.adaptertransition.MainActivity"
-            android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java
deleted file mode 100644
index a949818..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright 2014 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.example.android.adaptertransition;
-
-import android.os.Bundle;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.transition.AutoTransition;
-import android.transition.Scene;
-import android.transition.Transition;
-import android.transition.TransitionManager;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.FrameLayout;
-import android.widget.GridView;
-import android.widget.ListView;
-import android.widget.Toast;
-
-/**
- * Main screen for AdapterTransition sample.
- */
-public class AdapterTransitionFragment extends Fragment implements Transition.TransitionListener {
-
-    /**
-     * Since the transition framework requires all relevant views in a view hierarchy to be marked
-     * with IDs, we use this ID to mark the root view.
-     */
-    private static final int ROOT_ID = 1;
-
-    /**
-     * A tag for saving state whether the mAbsListView is ListView or GridView.
-     */
-    private static final String STATE_IS_LISTVIEW = "is_listview";
-
-    /**
-     * This is where we place our AdapterView (ListView / GridView).
-     */
-    private FrameLayout mContent;
-
-    /**
-     * This is where we carry out the transition.
-     */
-    private FrameLayout mCover;
-
-    /**
-     * This list shows our contents. It can be ListView or GridView, and we toggle between them
-     * using the transition framework.
-     */
-    private AbsListView mAbsListView;
-
-    /**
-     * This is our contents.
-     */
-    private MeatAdapter mAdapter;
-
-    public static AdapterTransitionFragment newInstance() {
-        return new AdapterTransitionFragment();
-    }
-
-    public AdapterTransitionFragment() {
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // If savedInstanceState is available, we restore the state whether the list is a ListView
-        // or a GridView.
-        boolean isListView;
-        if (null == savedInstanceState) {
-            isListView = true;
-        } else {
-            isListView = savedInstanceState.getBoolean(STATE_IS_LISTVIEW, true);
-        }
-        inflateAbsList(inflater, container, isListView);
-        return inflater.inflate(R.layout.fragment_adapter_transition, container, false);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putBoolean(STATE_IS_LISTVIEW, mAbsListView instanceof ListView);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        // Retaining references for FrameLayouts that we use later.
-        mContent = (FrameLayout) view.findViewById(R.id.content);
-        mCover = (FrameLayout) view.findViewById(R.id.cover);
-        // We are attaching the list to the screen here.
-        mContent.addView(mAbsListView);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.fragment_adapter_transition, menu);
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        // We change the look of the icon every time the user toggles between list and grid.
-        MenuItem item = menu.findItem(R.id.action_toggle);
-        if (null != item) {
-            if (mAbsListView instanceof ListView) {
-                item.setIcon(R.drawable.ic_action_grid);
-                item.setTitle(R.string.show_as_grid);
-            } else {
-                item.setIcon(R.drawable.ic_action_list);
-                item.setTitle(R.string.show_as_list);
-            }
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_toggle: {
-                toggle();
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void onTransitionStart(Transition transition) {
-    }
-
-    // BEGIN_INCLUDE(on_transition_end)
-    @Override
-    public void onTransitionEnd(Transition transition) {
-        // When the transition ends, we remove all the views from the overlay and hide it.
-        mCover.removeAllViews();
-        mCover.setVisibility(View.INVISIBLE);
-    }
-    // END_INCLUDE(on_transition_end)
-
-    @Override
-    public void onTransitionCancel(Transition transition) {
-    }
-
-    @Override
-    public void onTransitionPause(Transition transition) {
-    }
-
-    @Override
-    public void onTransitionResume(Transition transition) {
-    }
-
-    /**
-     * Inflate a ListView or a GridView with a corresponding ListAdapter.
-     *
-     * @param inflater The LayoutInflater.
-     * @param container The ViewGroup that contains this AbsListView. The AbsListView won't be
-     *                  attached to it.
-     * @param inflateListView Pass true to inflate a ListView, or false to inflate a GridView.
-     */
-    private void inflateAbsList(LayoutInflater inflater, ViewGroup container,
-                                boolean inflateListView) {
-        if (inflateListView) {
-            mAbsListView = (AbsListView) inflater.inflate(R.layout.fragment_meat_list,
-                    container, false);
-            mAdapter = new MeatAdapter(inflater, R.layout.item_meat_list);
-        } else {
-            mAbsListView = (AbsListView) inflater.inflate(R.layout.fragment_meat_grid,
-                    container, false);
-            mAdapter = new MeatAdapter(inflater, R.layout.item_meat_grid);
-        }
-        mAbsListView.setAdapter(mAdapter);
-        mAbsListView.setOnItemClickListener(mAdapter);
-    }
-
-    /**
-     * Toggle the UI between ListView and GridView.
-     */
-    private void toggle() {
-        // We use mCover as the overlay on which we carry out the transition.
-        mCover.setVisibility(View.VISIBLE);
-        // This FrameLayout holds all the visible views in the current list or grid. We use this as
-        // the starting Scene of the Transition later.
-        FrameLayout before = copyVisibleViews();
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT);
-        mCover.addView(before, params);
-        // Swap the actual list.
-        swapAbsListView();
-        // We also swap the icon for the toggle button.
-        ActivityCompat.invalidateOptionsMenu(getActivity());
-        // It is now ready to start the transition.
-        mAbsListView.post(new Runnable() {
-            @Override
-            public void run() {
-                // BEGIN_INCLUDE(transition_with_listener)
-                Scene scene = new Scene(mCover, copyVisibleViews());
-                Transition transition = new AutoTransition();
-                transition.addListener(AdapterTransitionFragment.this);
-                TransitionManager.go(scene, transition);
-                // END_INCLUDE(transition_with_listener)
-            }
-        });
-    }
-
-    /**
-     * Swap ListView with GridView, or GridView with ListView.
-     */
-    private void swapAbsListView() {
-        // We save the current scrolling position before removing the current list.
-        int first = mAbsListView.getFirstVisiblePosition();
-        // If the current list is a GridView, we replace it with a ListView. If it is a ListView,
-        // a GridView.
-        LayoutInflater inflater = LayoutInflater.from(getActivity());
-        inflateAbsList(inflater, (ViewGroup) mAbsListView.getParent(),
-                mAbsListView instanceof GridView);
-        mAbsListView.setAdapter(mAdapter);
-        // We restore the scrolling position here.
-        mAbsListView.setSelection(first);
-        // The new list is ready, and we replace the existing one with it.
-        mContent.removeAllViews();
-        mContent.addView(mAbsListView);
-    }
-
-    /**
-     * Copy all the visible views in the mAbsListView into a new FrameLayout and return it.
-     *
-     * @return a FrameLayout with all the visible views inside.
-     */
-    private FrameLayout copyVisibleViews() {
-        // This is the FrameLayout we return afterwards.
-        FrameLayout layout = new FrameLayout(getActivity());
-        // The transition framework requires to set ID for all views to be animated.
-        layout.setId(ROOT_ID);
-        // We only copy visible views.
-        int first = mAbsListView.getFirstVisiblePosition();
-        int index = 0;
-        while (true) {
-            // This is one of the views that we copy. Note that the argument for getChildAt is a
-            // zero-oriented index, and it doesn't usually match with its position in the list.
-            View source = mAbsListView.getChildAt(index);
-            if (null == source) {
-                break;
-            }
-            // This is the copy of the original view.
-            View destination = mAdapter.getView(first + index, null, layout);
-            assert destination != null;
-            destination.setId(ROOT_ID + first + index);
-            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-                    source.getWidth(), source.getHeight());
-            params.leftMargin = (int) source.getX();
-            params.topMargin = (int) source.getY();
-            layout.addView(destination, params);
-            ++index;
-        }
-        return layout;
-    }
-
-}
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MainActivity.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MainActivity.java
deleted file mode 100644
index 0adb842..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MainActivity.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-* Copyright 2013 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.example.android.adaptertransition;
-
-import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.ViewAnimator;
-
-import com.example.android.common.activities.SampleActivityBase;
-import com.example.android.common.logger.Log;
-import com.example.android.common.logger.LogFragment;
-import com.example.android.common.logger.LogWrapper;
-import com.example.android.common.logger.MessageOnlyLogFilter;
-
-/**
- * A simple launcher activity containing a summary sample description, sample log and a custom
- * {@link android.support.v4.app.Fragment} which can display a view.
- * <p>
- * For devices with displays with a width of 720dp or greater, the sample log is always visible,
- * on other devices it's visibility is controlled by an item on the Action Bar.
- */
-public class MainActivity extends SampleActivityBase {
-
-    public static final String TAG = "MainActivity";
-
-    // Whether the Log Fragment is currently shown
-    private boolean mLogShown;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        if (savedInstanceState == null) {
-            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-            AdapterTransitionFragment fragment = new AdapterTransitionFragment();
-            transaction.replace(R.id.sample_content_fragment, fragment);
-            transaction.commit();
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.main, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        MenuItem logToggle = menu.findItem(R.id.menu_toggle_log);
-        logToggle.setVisible(findViewById(R.id.sample_output) instanceof ViewAnimator);
-        logToggle.setTitle(mLogShown ? R.string.sample_hide_log : R.string.sample_show_log);
-
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch(item.getItemId()) {
-            case R.id.menu_toggle_log:
-                mLogShown = !mLogShown;
-                ViewAnimator output = (ViewAnimator) findViewById(R.id.sample_output);
-                if (mLogShown) {
-                    output.setDisplayedChild(1);
-                } else {
-                    output.setDisplayedChild(0);
-                }
-                supportInvalidateOptionsMenu();
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    /** Create a chain of targets that will receive log data */
-    @Override
-    public void initializeLogging() {
-        // Wraps Android's native log framework.
-        LogWrapper logWrapper = new LogWrapper();
-        // Using Log, front-end to the logging chain, emulates android.util.log method signatures.
-        Log.setLogNode(logWrapper);
-
-        // Filter strips out everything except the message text.
-        MessageOnlyLogFilter msgFilter = new MessageOnlyLogFilter();
-        logWrapper.setNext(msgFilter);
-
-        // On screen logging via a fragment with a TextView.
-        LogFragment logFragment = (LogFragment) getSupportFragmentManager()
-                .findFragmentById(R.id.log_fragment);
-        msgFilter.setNext(logFragment.getLogView());
-
-        Log.i(TAG, "Ready");
-    }
-}
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/Meat.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/Meat.java
deleted file mode 100644
index bca1c5f..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/Meat.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2014 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.example.android.adaptertransition;
-
-/**
- * Sample data.
- */
-public class Meat {
-
-    public int resourceId;
-    public String title;
-
-    public Meat(int resourceId, String title) {
-        this.resourceId = resourceId;
-        this.title = title;
-    }
-
-    public static final Meat[] MEATS = {
-            new Meat(R.drawable.p1, "First"),
-            new Meat(R.drawable.p2, "Second"),
-            new Meat(R.drawable.p3, "Third"),
-            new Meat(R.drawable.p4, "Fourth"),
-            new Meat(R.drawable.p5, "Fifth"),
-            new Meat(R.drawable.p6, "Sixth"),
-            new Meat(R.drawable.p7, "Seventh"),
-            new Meat(R.drawable.p8, "Eighth"),
-            new Meat(R.drawable.p9, "Ninth"),
-            new Meat(R.drawable.p10, "Tenth"),
-            new Meat(R.drawable.p11, "Eleventh"),
-    };
-
-}
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MeatAdapter.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MeatAdapter.java
deleted file mode 100644
index dea4435..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MeatAdapter.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2014 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.example.android.adaptertransition;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * This class provides data as Views. It is designed to support both ListView and GridView by
- * changing a layout resource file to inflate.
- */
-public class MeatAdapter extends BaseAdapter implements AbsListView.OnItemClickListener {
-
-    private final LayoutInflater mLayoutInflater;
-    private final int mResourceId;
-
-    /**
-     * Create a new instance of {@link MeatAdapter}.
-     *
-     * @param inflater   The layout inflater.
-     * @param resourceId The resource ID for the layout to be used. The layout should contain an
-     *                   ImageView with ID of "meat_image" and a TextView with ID of "meat_title".
-     */
-    public MeatAdapter(LayoutInflater inflater, int resourceId) {
-        mLayoutInflater = inflater;
-        mResourceId = resourceId;
-    }
-
-    @Override
-    public int getCount() {
-        return Meat.MEATS.length;
-    }
-
-    @Override
-    public Meat getItem(int position) {
-        return Meat.MEATS[position];
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return Meat.MEATS[position].resourceId;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        final View view;
-        final ViewHolder holder;
-        if (null == convertView) {
-            view = mLayoutInflater.inflate(mResourceId, parent, false);
-            holder = new ViewHolder();
-            assert view != null;
-            holder.image = (ImageView) view.findViewById(R.id.meat_image);
-            holder.title = (TextView) view.findViewById(R.id.meat_title);
-            view.setTag(holder);
-        } else {
-            view = convertView;
-            holder = (ViewHolder) view.getTag();
-        }
-        Meat meat = getItem(position);
-        holder.image.setImageResource(meat.resourceId);
-        holder.title.setText(meat.title);
-        return view;
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        ViewHolder holder = (ViewHolder) view.getTag();
-        Context context = view.getContext();
-        if (null != holder && null != holder.title && null != context) {
-            Toast.makeText(context, context.getString(R.string.item_clicked,
-                    holder.title.getText()), Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    private static class ViewHolder {
-        public ImageView image;
-        public TextView title;
-    }
-
-}
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
deleted file mode 100644
index 3228927..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* Copyright 2013 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.example.android.common.activities;
-
-import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-
-import com.example.android.common.logger.Log;
-import com.example.android.common.logger.LogWrapper;
-
-/**
- * Base launcher activity, to handle most of the common plumbing for samples.
- */
-public class SampleActivityBase extends FragmentActivity {
-
-    public static final String TAG = "SampleActivityBase";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected  void onStart() {
-        super.onStart();
-        initializeLogging();
-    }
-
-    /** Set up targets to receive log data */
-    public void initializeLogging() {
-        // Using Log, front-end to the logging chain, emulates android.util.log method signatures.
-        // Wraps Android's native log framework
-        LogWrapper logWrapper = new LogWrapper();
-        Log.setLogNode(logWrapper);
-
-        Log.i(TAG, "Ready");
-    }
-}
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
deleted file mode 100644
index 20049e3..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (C) 2013 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.example.android.common.view;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.HorizontalScrollView;
-import android.widget.TextView;
-
-/**
- * To be used with ViewPager to provide a tab indicator component which give constant feedback as to
- * the user's scroll progress.
- * <p>
- * To use the component, simply add it to your view hierarchy. Then in your
- * {@link android.app.Activity} or {@link android.support.v4.app.Fragment} call
- * {@link #setViewPager(ViewPager)} providing it the ViewPager this layout is being used for.
- * <p>
- * The colors can be customized in two ways. The first and simplest is to provide an array of colors
- * via {@link #setSelectedIndicatorColors(int...)} and {@link #setDividerColors(int...)}. The
- * alternative is via the {@link TabColorizer} interface which provides you complete control over
- * which color is used for any individual position.
- * <p>
- * The views used as tabs can be customized by calling {@link #setCustomTabView(int, int)},
- * providing the layout ID of your custom layout.
- */
-public class SlidingTabLayout extends HorizontalScrollView {
-
-    /**
-     * Allows complete control over the colors drawn in the tab layout. Set with
-     * {@link #setCustomTabColorizer(TabColorizer)}.
-     */
-    public interface TabColorizer {
-
-        /**
-         * @return return the color of the indicator used when {@code position} is selected.
-         */
-        int getIndicatorColor(int position);
-
-        /**
-         * @return return the color of the divider drawn to the right of {@code position}.
-         */
-        int getDividerColor(int position);
-
-    }
-
-    private static final int TITLE_OFFSET_DIPS = 24;
-    private static final int TAB_VIEW_PADDING_DIPS = 16;
-    private static final int TAB_VIEW_TEXT_SIZE_SP = 12;
-
-    private int mTitleOffset;
-
-    private int mTabViewLayoutId;
-    private int mTabViewTextViewId;
-
-    private ViewPager mViewPager;
-    private ViewPager.OnPageChangeListener mViewPagerPageChangeListener;
-
-    private final SlidingTabStrip mTabStrip;
-
-    public SlidingTabLayout(Context context) {
-        this(context, null);
-    }
-
-    public SlidingTabLayout(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SlidingTabLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-
-        // Disable the Scroll Bar
-        setHorizontalScrollBarEnabled(false);
-        // Make sure that the Tab Strips fills this View
-        setFillViewport(true);
-
-        mTitleOffset = (int) (TITLE_OFFSET_DIPS * getResources().getDisplayMetrics().density);
-
-        mTabStrip = new SlidingTabStrip(context);
-        addView(mTabStrip, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-    }
-
-    /**
-     * Set the custom {@link TabColorizer} to be used.
-     *
-     * If you only require simple custmisation then you can use
-     * {@link #setSelectedIndicatorColors(int...)} and {@link #setDividerColors(int...)} to achieve
-     * similar effects.
-     */
-    public void setCustomTabColorizer(TabColorizer tabColorizer) {
-        mTabStrip.setCustomTabColorizer(tabColorizer);
-    }
-
-    /**
-     * Sets the colors to be used for indicating the selected tab. These colors are treated as a
-     * circular array. Providing one color will mean that all tabs are indicated with the same color.
-     */
-    public void setSelectedIndicatorColors(int... colors) {
-        mTabStrip.setSelectedIndicatorColors(colors);
-    }
-
-    /**
-     * Sets the colors to be used for tab dividers. These colors are treated as a circular array.
-     * Providing one color will mean that all tabs are indicated with the same color.
-     */
-    public void setDividerColors(int... colors) {
-        mTabStrip.setDividerColors(colors);
-    }
-
-    /**
-     * Set the {@link ViewPager.OnPageChangeListener}. When using {@link SlidingTabLayout} you are
-     * required to set any {@link ViewPager.OnPageChangeListener} through this method. This is so
-     * that the layout can update it's scroll position correctly.
-     *
-     * @see ViewPager#setOnPageChangeListener(ViewPager.OnPageChangeListener)
-     */
-    public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) {
-        mViewPagerPageChangeListener = listener;
-    }
-
-    /**
-     * Set the custom layout to be inflated for the tab views.
-     *
-     * @param layoutResId Layout id to be inflated
-     * @param textViewId id of the {@link TextView} in the inflated view
-     */
-    public void setCustomTabView(int layoutResId, int textViewId) {
-        mTabViewLayoutId = layoutResId;
-        mTabViewTextViewId = textViewId;
-    }
-
-    /**
-     * Sets the associated view pager. Note that the assumption here is that the pager content
-     * (number of tabs and tab titles) does not change after this call has been made.
-     */
-    public void setViewPager(ViewPager viewPager) {
-        mTabStrip.removeAllViews();
-
-        mViewPager = viewPager;
-        if (viewPager != null) {
-            viewPager.setOnPageChangeListener(new InternalViewPagerListener());
-            populateTabStrip();
-        }
-    }
-
-    /**
-     * Create a default view to be used for tabs. This is called if a custom tab view is not set via
-     * {@link #setCustomTabView(int, int)}.
-     */
-    protected TextView createDefaultTabView(Context context) {
-        TextView textView = new TextView(context);
-        textView.setGravity(Gravity.CENTER);
-        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, TAB_VIEW_TEXT_SIZE_SP);
-        textView.setTypeface(Typeface.DEFAULT_BOLD);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            // If we're running on Honeycomb or newer, then we can use the Theme's
-            // selectableItemBackground to ensure that the View has a pressed state
-            TypedValue outValue = new TypedValue();
-            getContext().getTheme().resolveAttribute(android.R.attr.selectableItemBackground,
-                    outValue, true);
-            textView.setBackgroundResource(outValue.resourceId);
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            // If we're running on ICS or newer, enable all-caps to match the Action Bar tab style
-            textView.setAllCaps(true);
-        }
-
-        int padding = (int) (TAB_VIEW_PADDING_DIPS * getResources().getDisplayMetrics().density);
-        textView.setPadding(padding, padding, padding, padding);
-
-        return textView;
-    }
-
-    private void populateTabStrip() {
-        final PagerAdapter adapter = mViewPager.getAdapter();
-        final View.OnClickListener tabClickListener = new TabClickListener();
-
-        for (int i = 0; i < adapter.getCount(); i++) {
-            View tabView = null;
-            TextView tabTitleView = null;
-
-            if (mTabViewLayoutId != 0) {
-                // If there is a custom tab view layout id set, try and inflate it
-                tabView = LayoutInflater.from(getContext()).inflate(mTabViewLayoutId, mTabStrip,
-                        false);
-                tabTitleView = (TextView) tabView.findViewById(mTabViewTextViewId);
-            }
-
-            if (tabView == null) {
-                tabView = createDefaultTabView(getContext());
-            }
-
-            if (tabTitleView == null && TextView.class.isInstance(tabView)) {
-                tabTitleView = (TextView) tabView;
-            }
-
-            tabTitleView.setText(adapter.getPageTitle(i));
-            tabView.setOnClickListener(tabClickListener);
-
-            mTabStrip.addView(tabView);
-        }
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-
-        if (mViewPager != null) {
-            scrollToTab(mViewPager.getCurrentItem(), 0);
-        }
-    }
-
-    private void scrollToTab(int tabIndex, int positionOffset) {
-        final int tabStripChildCount = mTabStrip.getChildCount();
-        if (tabStripChildCount == 0 || tabIndex < 0 || tabIndex >= tabStripChildCount) {
-            return;
-        }
-
-        View selectedChild = mTabStrip.getChildAt(tabIndex);
-        if (selectedChild != null) {
-            int targetScrollX = selectedChild.getLeft() + positionOffset;
-
-            if (tabIndex > 0 || positionOffset > 0) {
-                // If we're not at the first child and are mid-scroll, make sure we obey the offset
-                targetScrollX -= mTitleOffset;
-            }
-
-            scrollTo(targetScrollX, 0);
-        }
-    }
-
-    private class InternalViewPagerListener implements ViewPager.OnPageChangeListener {
-        private int mScrollState;
-
-        @Override
-        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-            int tabStripChildCount = mTabStrip.getChildCount();
-            if ((tabStripChildCount == 0) || (position < 0) || (position >= tabStripChildCount)) {
-                return;
-            }
-
-            mTabStrip.onViewPagerPageChanged(position, positionOffset);
-
-            View selectedTitle = mTabStrip.getChildAt(position);
-            int extraOffset = (selectedTitle != null)
-                    ? (int) (positionOffset * selectedTitle.getWidth())
-                    : 0;
-            scrollToTab(position, extraOffset);
-
-            if (mViewPagerPageChangeListener != null) {
-                mViewPagerPageChangeListener.onPageScrolled(position, positionOffset,
-                        positionOffsetPixels);
-            }
-        }
-
-        @Override
-        public void onPageScrollStateChanged(int state) {
-            mScrollState = state;
-
-            if (mViewPagerPageChangeListener != null) {
-                mViewPagerPageChangeListener.onPageScrollStateChanged(state);
-            }
-        }
-
-        @Override
-        public void onPageSelected(int position) {
-            if (mScrollState == ViewPager.SCROLL_STATE_IDLE) {
-                mTabStrip.onViewPagerPageChanged(position, 0f);
-                scrollToTab(position, 0);
-            }
-
-            if (mViewPagerPageChangeListener != null) {
-                mViewPagerPageChangeListener.onPageSelected(position);
-            }
-        }
-
-    }
-
-    private class TabClickListener implements View.OnClickListener {
-        @Override
-        public void onClick(View v) {
-            for (int i = 0; i < mTabStrip.getChildCount(); i++) {
-                if (v == mTabStrip.getChildAt(i)) {
-                    mViewPager.setCurrentItem(i);
-                    return;
-                }
-            }
-        }
-    }
-
-}
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
deleted file mode 100644
index d5bbbae..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2013 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.example.android.common.view;
-
-import android.R;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.LinearLayout;
-
-class SlidingTabStrip extends LinearLayout {
-
-    private static final int DEFAULT_BOTTOM_BORDER_THICKNESS_DIPS = 2;
-    private static final byte DEFAULT_BOTTOM_BORDER_COLOR_ALPHA = 0x26;
-    private static final int SELECTED_INDICATOR_THICKNESS_DIPS = 8;
-    private static final int DEFAULT_SELECTED_INDICATOR_COLOR = 0xFF33B5E5;
-
-    private static final int DEFAULT_DIVIDER_THICKNESS_DIPS = 1;
-    private static final byte DEFAULT_DIVIDER_COLOR_ALPHA = 0x20;
-    private static final float DEFAULT_DIVIDER_HEIGHT = 0.5f;
-
-    private final int mBottomBorderThickness;
-    private final Paint mBottomBorderPaint;
-
-    private final int mSelectedIndicatorThickness;
-    private final Paint mSelectedIndicatorPaint;
-
-    private final int mDefaultBottomBorderColor;
-
-    private final Paint mDividerPaint;
-    private final float mDividerHeight;
-
-    private int mSelectedPosition;
-    private float mSelectionOffset;
-
-    private SlidingTabLayout.TabColorizer mCustomTabColorizer;
-    private final SimpleTabColorizer mDefaultTabColorizer;
-
-    SlidingTabStrip(Context context) {
-        this(context, null);
-    }
-
-    SlidingTabStrip(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setWillNotDraw(false);
-
-        final float density = getResources().getDisplayMetrics().density;
-
-        TypedValue outValue = new TypedValue();
-        context.getTheme().resolveAttribute(R.attr.colorForeground, outValue, true);
-        final int themeForegroundColor =  outValue.data;
-
-        mDefaultBottomBorderColor = setColorAlpha(themeForegroundColor,
-                DEFAULT_BOTTOM_BORDER_COLOR_ALPHA);
-
-        mDefaultTabColorizer = new SimpleTabColorizer();
-        mDefaultTabColorizer.setIndicatorColors(DEFAULT_SELECTED_INDICATOR_COLOR);
-        mDefaultTabColorizer.setDividerColors(setColorAlpha(themeForegroundColor,
-                DEFAULT_DIVIDER_COLOR_ALPHA));
-
-        mBottomBorderThickness = (int) (DEFAULT_BOTTOM_BORDER_THICKNESS_DIPS * density);
-        mBottomBorderPaint = new Paint();
-        mBottomBorderPaint.setColor(mDefaultBottomBorderColor);
-
-        mSelectedIndicatorThickness = (int) (SELECTED_INDICATOR_THICKNESS_DIPS * density);
-        mSelectedIndicatorPaint = new Paint();
-
-        mDividerHeight = DEFAULT_DIVIDER_HEIGHT;
-        mDividerPaint = new Paint();
-        mDividerPaint.setStrokeWidth((int) (DEFAULT_DIVIDER_THICKNESS_DIPS * density));
-    }
-
-    void setCustomTabColorizer(SlidingTabLayout.TabColorizer customTabColorizer) {
-        mCustomTabColorizer = customTabColorizer;
-        invalidate();
-    }
-
-    void setSelectedIndicatorColors(int... colors) {
-        // Make sure that the custom colorizer is removed
-        mCustomTabColorizer = null;
-        mDefaultTabColorizer.setIndicatorColors(colors);
-        invalidate();
-    }
-
-    void setDividerColors(int... colors) {
-        // Make sure that the custom colorizer is removed
-        mCustomTabColorizer = null;
-        mDefaultTabColorizer.setDividerColors(colors);
-        invalidate();
-    }
-
-    void onViewPagerPageChanged(int position, float positionOffset) {
-        mSelectedPosition = position;
-        mSelectionOffset = positionOffset;
-        invalidate();
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        final int height = getHeight();
-        final int childCount = getChildCount();
-        final int dividerHeightPx = (int) (Math.min(Math.max(0f, mDividerHeight), 1f) * height);
-        final SlidingTabLayout.TabColorizer tabColorizer = mCustomTabColorizer != null
-                ? mCustomTabColorizer
-                : mDefaultTabColorizer;
-
-        // Thick colored underline below the current selection
-        if (childCount > 0) {
-            View selectedTitle = getChildAt(mSelectedPosition);
-            int left = selectedTitle.getLeft();
-            int right = selectedTitle.getRight();
-            int color = tabColorizer.getIndicatorColor(mSelectedPosition);
-
-            if (mSelectionOffset > 0f && mSelectedPosition < (getChildCount() - 1)) {
-                int nextColor = tabColorizer.getIndicatorColor(mSelectedPosition + 1);
-                if (color != nextColor) {
-                    color = blendColors(nextColor, color, mSelectionOffset);
-                }
-
-                // Draw the selection partway between the tabs
-                View nextTitle = getChildAt(mSelectedPosition + 1);
-                left = (int) (mSelectionOffset * nextTitle.getLeft() +
-                        (1.0f - mSelectionOffset) * left);
-                right = (int) (mSelectionOffset * nextTitle.getRight() +
-                        (1.0f - mSelectionOffset) * right);
-            }
-
-            mSelectedIndicatorPaint.setColor(color);
-
-            canvas.drawRect(left, height - mSelectedIndicatorThickness, right,
-                    height, mSelectedIndicatorPaint);
-        }
-
-        // Thin underline along the entire bottom edge
-        canvas.drawRect(0, height - mBottomBorderThickness, getWidth(), height, mBottomBorderPaint);
-
-        // Vertical separators between the titles
-        int separatorTop = (height - dividerHeightPx) / 2;
-        for (int i = 0; i < childCount - 1; i++) {
-            View child = getChildAt(i);
-            mDividerPaint.setColor(tabColorizer.getDividerColor(i));
-            canvas.drawLine(child.getRight(), separatorTop, child.getRight(),
-                    separatorTop + dividerHeightPx, mDividerPaint);
-        }
-    }
-
-    /**
-     * Set the alpha value of the {@code color} to be the given {@code alpha} value.
-     */
-    private static int setColorAlpha(int color, byte alpha) {
-        return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color));
-    }
-
-    /**
-     * Blend {@code color1} and {@code color2} using the given ratio.
-     *
-     * @param ratio of which to blend. 1.0 will return {@code color1}, 0.5 will give an even blend,
-     *              0.0 will return {@code color2}.
-     */
-    private static int blendColors(int color1, int color2, float ratio) {
-        final float inverseRation = 1f - ratio;
-        float r = (Color.red(color1) * ratio) + (Color.red(color2) * inverseRation);
-        float g = (Color.green(color1) * ratio) + (Color.green(color2) * inverseRation);
-        float b = (Color.blue(color1) * ratio) + (Color.blue(color2) * inverseRation);
-        return Color.rgb((int) r, (int) g, (int) b);
-    }
-
-    private static class SimpleTabColorizer implements SlidingTabLayout.TabColorizer {
-        private int[] mIndicatorColors;
-        private int[] mDividerColors;
-
-        @Override
-        public final int getIndicatorColor(int position) {
-            return mIndicatorColors[position % mIndicatorColors.length];
-        }
-
-        @Override
-        public final int getDividerColor(int position) {
-            return mDividerColors[position % mDividerColors.length];
-        }
-
-        void setIndicatorColors(int... colors) {
-            mIndicatorColors = colors;
-        }
-
-        void setDividerColors(int... colors) {
-            mDividerColors = colors;
-        }
-    }
-}
\ No newline at end of file
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_grid.png
deleted file mode 100644
index e04f4a7..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_grid.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_list.png
deleted file mode 100644
index 4131dba..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_list.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index b7a67c0..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_grid.png
deleted file mode 100644
index f2a83e3..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_grid.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_list.png
deleted file mode 100644
index e248a48..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_list.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 1c9fc09..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p1.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p1.jpg
deleted file mode 100644
index 10f07ac..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p1.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p10.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p10.jpg
deleted file mode 100644
index 4272f4c..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p10.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p11.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p11.jpg
deleted file mode 100644
index c5722b2..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p11.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p2.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p2.jpg
deleted file mode 100644
index ca380ae..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p2.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p3.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p3.jpg
deleted file mode 100644
index 6fc71e7..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p3.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p4.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p4.jpg
deleted file mode 100644
index 153c1ff..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p4.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p5.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p5.jpg
deleted file mode 100644
index 46d6a13..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p5.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p6.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p6.jpg
deleted file mode 100644
index 89ccb83..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p6.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p7.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p7.jpg
deleted file mode 100644
index 7e9546d..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p7.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p8.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p8.jpg
deleted file mode 100644
index 21e25ba..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p8.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p9.jpg b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p9.jpg
deleted file mode 100644
index 79854cb..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p9.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_grid.png
deleted file mode 100644
index ecd39b5..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_grid.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_list.png
deleted file mode 100644
index e7e510d..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_list.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 11b9928..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_grid.png
deleted file mode 100644
index 3ba98fc..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_grid.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_list.png
deleted file mode 100644
index d187732..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_list.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index f136c9f..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_adapter_transition.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_adapter_transition.xml
deleted file mode 100644
index 22ec090..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_adapter_transition.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="com.example.android.adaptertransition.AdapterTransitionFragment">
-
-    <FrameLayout
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <FrameLayout
-        android:id="@+id/cover"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#f3f3f3"
-        android:visibility="invisible"/>
-
-</FrameLayout>
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_grid.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_grid.xml
deleted file mode 100644
index 9a4f7a1..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_grid.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-<GridView
-    android:id="@+id/abs_list_view"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:columnWidth="150dp"
-    android:horizontalSpacing="1dp"
-    android:numColumns="auto_fit"
-    android:padding="1dp"
-    android:scrollbars="none"
-    android:stretchMode="columnWidth"
-    android:verticalSpacing="1dp"/>
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_list.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_list.xml
deleted file mode 100644
index 4523b26..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_list.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-<ListView
-    android:id="@+id/abs_list_view"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_grid.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_grid.xml
deleted file mode 100644
index d7fb77a..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_grid.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-<RelativeLayout
-    android:id="@+id/meat_container"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="150dp">
-
-    <ImageView
-        android:id="@+id/meat_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        tools:src="@drawable/p1"/>
-
-    <TextView
-        android:id="@+id/meat_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="16dp"
-        android:layout_marginStart="16dp"
-        android:gravity="center_horizontal"
-        android:shadowColor="#000000"
-        android:shadowDx="0"
-        android:shadowDy="0"
-        android:shadowRadius="10"
-        android:textColor="#ffffff"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        tools:text="Hello"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_list.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_list.xml
deleted file mode 100644
index 8d75b90..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_list.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-<RelativeLayout
-    android:id="@+id/meat_container"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart">
-
-    <ImageView
-        android:id="@+id/meat_image"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
-        android:scaleType="centerCrop"
-        tools:src="@drawable/p1"/>
-
-    <TextView
-        android:id="@+id/meat_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
-        android:layout_toEndOf="@id/meat_image"
-        android:layout_centerInParent="true"
-        android:gravity="center_vertical"
-        android:textSize="24sp"
-        tools:text="Title"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/menu/fragment_adapter_transition.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/menu/fragment_adapter_transition.xml
deleted file mode 100644
index 10057b8..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/menu/fragment_adapter_transition.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/action_toggle"
-        android:icon="@drawable/ic_action_grid"
-        android:showAsAction="always|withText"
-        android:title="@string/show_as_grid"/>
-</menu>
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 09f86cd..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/base-strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-<resources>
-    <string name="app_name">AdapterTransition</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-	    Transition cannot be directly applied to AdapterViews. In this sample, we demonstrate how to create an overlay layout and run a Transition on it. Press the action bar button to toggle between ListView and GridView.
-            
-        
-        ]]>
-    </string>
-</resources>
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/strings.xml b/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/strings.xml
deleted file mode 100644
index 02b87cf..0000000
--- a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-<resources>
-    <string name="item_clicked">%s clicked</string>
-    <string name="show_as_grid">Show as grid</string>
-    <string name="show_as_list">Show as list</string>
-</resources>
diff --git a/prebuilts/gradle/AdapterTransition/CONTRIB.md b/prebuilts/gradle/AdapterTransition/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/AdapterTransition/CONTRIB.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# How to become a contributor and submit your own code
-
-## Contributor License Agreements
-
-We'd love to accept your sample apps and patches! Before we can take them, we
-have to jump a couple of legal hurdles.
-
-Please fill out either the individual or corporate Contributor License Agreement (CLA).
-
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an [individual CLA]
-    (https://developers.google.com/open-source/cla/individual).
-  * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a [corporate CLA]
-    (https://developers.google.com/open-source/cla/corporate).
-
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able to
-accept your pull requests.
-
-## Contributing A Patch
-
-1. Submit an issue describing your proposed change to the repo in question.
-1. The repo owner will respond to your issue promptly.
-1. If your proposed change is accepted, and you haven't already done so, sign a
-   Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
-1. Ensure that your code adheres to the existing style in the sample to which
-   you are contributing. Refer to the
-   [Android Code Style Guide]
-   (https://source.android.com/source/code-style.html) for the
-   recommended coding standards for this organization.
-1. Ensure that your code has an appropriate set of unit tests which all pass.
-1. Submit a pull request.
-
diff --git a/prebuilts/gradle/AdapterTransition/packaging.yaml b/prebuilts/gradle/AdapterTransition/packaging.yaml
deleted file mode 100644
index c90a0b0..0000000
--- a/prebuilts/gradle/AdapterTransition/packaging.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# GOOGLE SAMPLE PACKAGING DATA
-#
-# This file is used by Google as part of our samples packaging process.
-# End users may safely ignore this file. It has no relevance to other systems.
----
-
-status:       PUBLISHED
-technologies: [Android]
-categories:   [UI]
-languages:    [Java]
-solutions:    [Mobile]
-github:       googlesamples/android-AdapterTransition
-level:        BEGINNER
-icon:         AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2-android
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/build.gradle b/prebuilts/gradle/AdvancedImmersiveMode/Application/build.gradle
index c6b8c26..d7a41be 100644
--- a/prebuilts/gradle/AdvancedImmersiveMode/Application/build.gradle
+++ b/prebuilts/gradle/AdvancedImmersiveMode/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 19
diff --git a/prebuilts/gradle/AdvancedImmersiveMode/README.md b/prebuilts/gradle/AdvancedImmersiveMode/README.md
index 6828c9a..efda840 100644
--- a/prebuilts/gradle/AdvancedImmersiveMode/README.md
+++ b/prebuilts/gradle/AdvancedImmersiveMode/README.md
@@ -26,7 +26,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/AgendaData/Application/build.gradle b/prebuilts/gradle/AgendaData/Application/build.gradle
index 5a8cfd3..e8f9f0d 100644
--- a/prebuilts/gradle/AgendaData/Application/build.gradle
+++ b/prebuilts/gradle/AgendaData/Application/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
@@ -10,10 +10,14 @@
 
 apply plugin: 'com.android.application'
 
+repositories {
+    jcenter()
+}
 
 dependencies {
-
-
+    compile "com.android.support:support-v4:21.0.2"
+    compile "com.android.support:support-v13:21.0.2"
+    compile "com.android.support:cardview-v7:21.0.2"
     compile 'com.google.android.gms:play-services-wearable:6.5.+'
     compile 'com.android.support:support-v13:21.0.+'
     wearApp project(':Wearable')
@@ -29,14 +33,11 @@
 
 android {
     compileSdkVersion 21
-
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
     }
 
     sourceSets {
diff --git a/prebuilts/gradle/AgendaData/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/AgendaData/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/AgendaData/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/AgendaData/README.md b/prebuilts/gradle/AgendaData/README.md
index c1dcff1..af248ed 100644
--- a/prebuilts/gradle/AgendaData/README.md
+++ b/prebuilts/gradle/AgendaData/README.md
@@ -22,7 +22,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/AgendaData/Wearable/build.gradle b/prebuilts/gradle/AgendaData/Wearable/build.gradle
index a207d2c..2b9b845 100644
--- a/prebuilts/gradle/AgendaData/Wearable/build.gradle
+++ b/prebuilts/gradle/AgendaData/Wearable/build.gradle
@@ -31,7 +31,7 @@
 android {
     compileSdkVersion 21
 
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         versionCode 1
diff --git a/prebuilts/gradle/AppRestrictionEnforcer/Application/build.gradle b/prebuilts/gradle/AppRestrictionEnforcer/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/AppRestrictionEnforcer/Application/build.gradle
+++ b/prebuilts/gradle/AppRestrictionEnforcer/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/AppRestrictionEnforcer/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/AppRestrictionEnforcer/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/AppRestrictionEnforcer/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/AppRestrictionEnforcer/Application/src/main/res/layout/fragment_setup_profile.xml b/prebuilts/gradle/AppRestrictionEnforcer/Application/src/main/res/layout/fragment_setup_profile.xml
index e9e9fe8..8fde91f 100644
--- a/prebuilts/gradle/AppRestrictionEnforcer/Application/src/main/res/layout/fragment_setup_profile.xml
+++ b/prebuilts/gradle/AppRestrictionEnforcer/Application/src/main/res/layout/fragment_setup_profile.xml
@@ -20,7 +20,7 @@
     android:layout_height="match_parent"
     tools:context="com.example.android.basicmanagedprofile.MainActivity.MainFragment">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
diff --git a/prebuilts/gradle/AppRestrictionEnforcer/Application/tests/src/com/example/android/apprestrictionenforcer/tests/SampleTests.java b/prebuilts/gradle/AppRestrictionEnforcer/Application/tests/src/com/example/android/apprestrictionenforcer/tests/SampleTests.java
index fbed64a..0404d95 100644
--- a/prebuilts/gradle/AppRestrictionEnforcer/Application/tests/src/com/example/android/apprestrictionenforcer/tests/SampleTests.java
+++ b/prebuilts/gradle/AppRestrictionEnforcer/Application/tests/src/com/example/android/apprestrictionenforcer/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,7 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private AppRestrictionEnforcerFragment mTestFragment;
+    private SetupProfileFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +40,8 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (AppRestrictionEnforcerFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
+        mTestFragment = (SetupProfileFragment)
+            mTestActivity.getSupportFragmentManager().getFragments().get(0);
     }
 
     /**
@@ -76,4 +58,4 @@
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/AppRestrictionEnforcer/README.md b/prebuilts/gradle/AppRestrictionEnforcer/README.md
index fb8a9c5..fbb0ce5 100644
--- a/prebuilts/gradle/AppRestrictionEnforcer/README.md
+++ b/prebuilts/gradle/AppRestrictionEnforcer/README.md
@@ -8,7 +8,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
diff --git a/prebuilts/gradle/AppRestrictionSchema/Application/build.gradle b/prebuilts/gradle/AppRestrictionSchema/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/AppRestrictionSchema/Application/build.gradle
+++ b/prebuilts/gradle/AppRestrictionSchema/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/AppRestrictionSchema/README.md b/prebuilts/gradle/AppRestrictionSchema/README.md
index 4c1c99f..7c0d322 100644
--- a/prebuilts/gradle/AppRestrictionSchema/README.md
+++ b/prebuilts/gradle/AppRestrictionSchema/README.md
@@ -54,7 +54,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/AppRestrictions/Application/build.gradle b/prebuilts/gradle/AppRestrictions/Application/build.gradle
index 3859b3e..4d71f5f 100644
--- a/prebuilts/gradle/AppRestrictions/Application/build.gradle
+++ b/prebuilts/gradle/AppRestrictions/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 18
diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/AppRestrictions/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/AppRestrictions/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/AppRestrictions/README.md b/prebuilts/gradle/AppRestrictions/README.md
index 3709256..184a417 100644
--- a/prebuilts/gradle/AppRestrictions/README.md
+++ b/prebuilts/gradle/AppRestrictions/README.md
@@ -12,7 +12,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
diff --git a/prebuilts/gradle/AppUsageStatistics/Application/build.gradle b/prebuilts/gradle/AppUsageStatistics/Application/build.gradle
index aecc5fd..0fa50ce 100644
--- a/prebuilts/gradle/AppUsageStatistics/Application/build.gradle
+++ b/prebuilts/gradle/AppUsageStatistics/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
     compile "com.android.support:recyclerview-v7:+"
     compile "com.android.support:appcompat-v7:21.+"
 }
@@ -35,7 +32,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/AppUsageStatistics/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/AppUsageStatistics/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/AppUsageStatistics/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/AppUsageStatistics/Application/tests/src/com/example/android/appusagestatistics/AppUsageStatisticsFragmentTests.java b/prebuilts/gradle/AppUsageStatistics/Application/tests/src/com/example/android/appusagestatistics/AppUsageStatisticsFragmentTests.java
index d8adb1c..68f9711 100644
--- a/prebuilts/gradle/AppUsageStatistics/Application/tests/src/com/example/android/appusagestatistics/AppUsageStatisticsFragmentTests.java
+++ b/prebuilts/gradle/AppUsageStatistics/Application/tests/src/com/example/android/appusagestatistics/AppUsageStatisticsFragmentTests.java
@@ -21,6 +21,7 @@
 import android.app.usage.UsageStats;
 import android.app.usage.UsageStatsManager;
 import android.test.ActivityInstrumentationTestCase2;
+import android.test.UiThreadTest;
 
 import java.util.List;
 
@@ -31,6 +32,7 @@
         extends ActivityInstrumentationTestCase2<AppUsageStatisticsActivity> {
 
     private AppUsageStatisticsActivity mTestActivity;
+
     private AppUsageStatisticsFragment mTestFragment;
 
     public AppUsageStatisticsFragmentTests() {
@@ -80,12 +82,11 @@
         assertNotNull(usageStatsList);
     }
 
+    @UiThreadTest
     public void testUpdateAppsList() {
         List<UsageStats> usageStatsList = mTestFragment
                 .getUsageStatistics(UsageStatsManager.INTERVAL_DAILY);
-
         mTestFragment.updateAppsList(usageStatsList);
-        getInstrumentation().waitForIdleSync();
 
         // The result depends on if the app is granted the access to App usage statistics.
         if (usageStatsList.size() == 0) {
diff --git a/prebuilts/gradle/AppUsageStatistics/README.md b/prebuilts/gradle/AppUsageStatistics/README.md
index daeb173..5e5d591 100644
--- a/prebuilts/gradle/AppUsageStatistics/README.md
+++ b/prebuilts/gradle/AppUsageStatistics/README.md
@@ -49,7 +49,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicAccessibility/Application/build.gradle b/prebuilts/gradle/BasicAccessibility/Application/build.gradle
index 8b72299..92f5366 100644
--- a/prebuilts/gradle/BasicAccessibility/Application/build.gradle
+++ b/prebuilts/gradle/BasicAccessibility/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:gridlayout-v7:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 11
diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java b/prebuilts/gradle/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
index 0c9a152..18a144d 100644
--- a/prebuilts/gradle/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
+++ b/prebuilts/gradle/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private BasicAccessibilityFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (BasicAccessibilityFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/BasicAccessibility/README.md b/prebuilts/gradle/BasicAccessibility/README.md
index a9f347a..f4986cb 100644
--- a/prebuilts/gradle/BasicAccessibility/README.md
+++ b/prebuilts/gradle/BasicAccessibility/README.md
@@ -20,7 +20,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/build.gradle b/prebuilts/gradle/BasicAndroidKeyStore/Application/build.gradle
index 3859b3e..4d71f5f 100644
--- a/prebuilts/gradle/BasicAndroidKeyStore/Application/build.gradle
+++ b/prebuilts/gradle/BasicAndroidKeyStore/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 18
diff --git a/prebuilts/gradle/BasicAndroidKeyStore/README.md b/prebuilts/gradle/BasicAndroidKeyStore/README.md
index b585378..6a9592e 100644
--- a/prebuilts/gradle/BasicAndroidKeyStore/README.md
+++ b/prebuilts/gradle/BasicAndroidKeyStore/README.md
@@ -23,7 +23,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicContactables/Application/build.gradle b/prebuilts/gradle/BasicContactables/Application/build.gradle
index 3859b3e..4d71f5f 100644
--- a/prebuilts/gradle/BasicContactables/Application/build.gradle
+++ b/prebuilts/gradle/BasicContactables/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 18
diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicContactables/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BasicContactables/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BasicContactables/Application/tests/src/com/example/android/basiccontactables/tests/SampleTests.java b/prebuilts/gradle/BasicContactables/Application/tests/src/com/example/android/basiccontactables/tests/SampleTests.java
index dd48bf2..b9bc1f5 100644
--- a/prebuilts/gradle/BasicContactables/Application/tests/src/com/example/android/basiccontactables/tests/SampleTests.java
+++ b/prebuilts/gradle/BasicContactables/Application/tests/src/com/example/android/basiccontactables/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private BasicContactablesFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (BasicContactablesFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/BasicContactables/README.md b/prebuilts/gradle/BasicContactables/README.md
index cd274c9..196cd62 100644
--- a/prebuilts/gradle/BasicContactables/README.md
+++ b/prebuilts/gradle/BasicContactables/README.md
@@ -25,7 +25,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicGestureDetect/Application/build.gradle b/prebuilts/gradle/BasicGestureDetect/Application/build.gradle
index 3859b3e..4d71f5f 100644
--- a/prebuilts/gradle/BasicGestureDetect/Application/build.gradle
+++ b/prebuilts/gradle/BasicGestureDetect/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 18
diff --git a/prebuilts/gradle/BasicGestureDetect/README.md b/prebuilts/gradle/BasicGestureDetect/README.md
index 835ea30..2d4759c 100644
--- a/prebuilts/gradle/BasicGestureDetect/README.md
+++ b/prebuilts/gradle/BasicGestureDetect/README.md
@@ -24,7 +24,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/build.gradle b/prebuilts/gradle/BasicImmersiveMode/Application/build.gradle
index c6b8c26..d7a41be 100644
--- a/prebuilts/gradle/BasicImmersiveMode/Application/build.gradle
+++ b/prebuilts/gradle/BasicImmersiveMode/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 19
diff --git a/prebuilts/gradle/BasicImmersiveMode/README.md b/prebuilts/gradle/BasicImmersiveMode/README.md
index 87ec7b8..865176a 100644
--- a/prebuilts/gradle/BasicImmersiveMode/README.md
+++ b/prebuilts/gradle/BasicImmersiveMode/README.md
@@ -19,7 +19,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicManagedProfile/Application/build.gradle b/prebuilts/gradle/BasicManagedProfile/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/BasicManagedProfile/Application/build.gradle
+++ b/prebuilts/gradle/BasicManagedProfile/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml b/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml
index 2aaaa93..6b1e0d3 100644
--- a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml
+++ b/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml
@@ -20,7 +20,7 @@
     android:layout_height="match_parent"
     tools:context="com.example.android.basicmanagedprofile.MainActivity.MainFragment">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
diff --git a/prebuilts/gradle/BasicManagedProfile/README.md b/prebuilts/gradle/BasicManagedProfile/README.md
index 8fcda8e..bb52fa1 100644
--- a/prebuilts/gradle/BasicManagedProfile/README.md
+++ b/prebuilts/gradle/BasicManagedProfile/README.md
@@ -38,7 +38,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/build.gradle b/prebuilts/gradle/BasicMediaDecoder/Application/build.gradle
index d727e2a..72d7943 100644
--- a/prebuilts/gradle/BasicMediaDecoder/Application/build.gradle
+++ b/prebuilts/gradle/BasicMediaDecoder/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 17
diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BasicMediaDecoder/README.md b/prebuilts/gradle/BasicMediaDecoder/README.md
index 1f5ec4a..8552e59 100644
--- a/prebuilts/gradle/BasicMediaDecoder/README.md
+++ b/prebuilts/gradle/BasicMediaDecoder/README.md
@@ -54,7 +54,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicMediaRouter/Application/build.gradle b/prebuilts/gradle/BasicMediaRouter/Application/build.gradle
index d727e2a..72d7943 100644
--- a/prebuilts/gradle/BasicMediaRouter/Application/build.gradle
+++ b/prebuilts/gradle/BasicMediaRouter/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 17
diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BasicMediaRouter/Application/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java b/prebuilts/gradle/BasicMediaRouter/Application/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java
index 5c475a3..f51dee8 100644
--- a/prebuilts/gradle/BasicMediaRouter/Application/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java
+++ b/prebuilts/gradle/BasicMediaRouter/Application/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private BasicMediaRouterFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (BasicMediaRouterFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/BasicMediaRouter/README.md b/prebuilts/gradle/BasicMediaRouter/README.md
index 330f476..e4eedbb 100644
--- a/prebuilts/gradle/BasicMediaRouter/README.md
+++ b/prebuilts/gradle/BasicMediaRouter/README.md
@@ -14,7 +14,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
diff --git a/prebuilts/gradle/BasicMultitouch/Application/build.gradle b/prebuilts/gradle/BasicMultitouch/Application/build.gradle
index 3e25a83..ccff6ac 100644
--- a/prebuilts/gradle/BasicMultitouch/Application/build.gradle
+++ b/prebuilts/gradle/BasicMultitouch/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:gridlayout-v7:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 8
diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BasicMultitouch/README.md b/prebuilts/gradle/BasicMultitouch/README.md
index 0f82d3d..fedf3fd 100644
--- a/prebuilts/gradle/BasicMultitouch/README.md
+++ b/prebuilts/gradle/BasicMultitouch/README.md
@@ -29,7 +29,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicNetworking/Application/build.gradle b/prebuilts/gradle/BasicNetworking/Application/build.gradle
index 76169de..e1be69a 100644
--- a/prebuilts/gradle/BasicNetworking/Application/build.gradle
+++ b/prebuilts/gradle/BasicNetworking/Application/build.gradle
@@ -14,11 +14,8 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -31,7 +28,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 4
diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicNetworking/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BasicNetworking/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BasicNetworking/Application/tests/src/com/example/android/basicnetworking/tests/SampleTests.java b/prebuilts/gradle/BasicNetworking/Application/tests/src/com/example/android/basicnetworking/tests/SampleTests.java
index 0cf077e..50b7ea7 100644
--- a/prebuilts/gradle/BasicNetworking/Application/tests/src/com/example/android/basicnetworking/tests/SampleTests.java
+++ b/prebuilts/gradle/BasicNetworking/Application/tests/src/com/example/android/basicnetworking/tests/SampleTests.java
@@ -43,7 +43,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private BasicNetworkingFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +57,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (BasicNetworkingFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +66,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/BasicNetworking/README.md b/prebuilts/gradle/BasicNetworking/README.md
index 25a04ce..b1da771 100644
--- a/prebuilts/gradle/BasicNetworking/README.md
+++ b/prebuilts/gradle/BasicNetworking/README.md
@@ -22,7 +22,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicNotifications/Application/build.gradle b/prebuilts/gradle/BasicNotifications/Application/build.gradle
index 3e25a83..ccff6ac 100644
--- a/prebuilts/gradle/BasicNotifications/Application/build.gradle
+++ b/prebuilts/gradle/BasicNotifications/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:gridlayout-v7:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 8
diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BasicNotifications/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BasicNotifications/Application/tests/src/com/example/android/basicnotifications/tests/SampleTests.java b/prebuilts/gradle/BasicNotifications/Application/tests/src/com/example/android/basicnotifications/tests/SampleTests.java
index ffe5840..59df3b7 100644
--- a/prebuilts/gradle/BasicNotifications/Application/tests/src/com/example/android/basicnotifications/tests/SampleTests.java
+++ b/prebuilts/gradle/BasicNotifications/Application/tests/src/com/example/android/basicnotifications/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private BasicNotificationsFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (BasicNotificationsFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/BasicNotifications/README.md b/prebuilts/gradle/BasicNotifications/README.md
index a421cfd..41b33de 100644
--- a/prebuilts/gradle/BasicNotifications/README.md
+++ b/prebuilts/gradle/BasicNotifications/README.md
@@ -53,7 +53,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicRenderScript/Application/build.gradle b/prebuilts/gradle/BasicRenderScript/Application/build.gradle
index 23a1863..67f0c8a 100644
--- a/prebuilts/gradle/BasicRenderScript/Application/build.gradle
+++ b/prebuilts/gradle/BasicRenderScript/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:gridlayout-v7:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
     compile files('renderscript-v8.jar')
 }
 
@@ -34,7 +31,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 8
diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/base-strings.xml
index 38f5f97..93a7391 100644
--- a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/base-strings.xml
+++ b/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/base-strings.xml
@@ -22,7 +22,7 @@
             
             This sample demonstrates using RenderScript to perform basic image manipulation. Specifically, it allows users
             to dynamically adjust the saturation for an image using a slider. A custom RenderScript kernel performs the saturation
-            adjustment, running the computation on the device's GPU or other compute hardware as deemed appropriate by the system.
+            adjustment, running the computation on the device\'s GPU or other compute hardware as deemed appropriate by the system.
             
         
         ]]>
diff --git a/prebuilts/gradle/BasicRenderScript/Application/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java b/prebuilts/gradle/BasicRenderScript/Application/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java
index b361507..90d0c77 100644
--- a/prebuilts/gradle/BasicRenderScript/Application/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java
+++ b/prebuilts/gradle/BasicRenderScript/Application/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private BasicRenderScriptFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (BasicRenderScriptFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/BasicRenderScript/README.md b/prebuilts/gradle/BasicRenderScript/README.md
index e41f278..bc7beab 100644
--- a/prebuilts/gradle/BasicRenderScript/README.md
+++ b/prebuilts/gradle/BasicRenderScript/README.md
@@ -3,7 +3,7 @@
 
 This sample demonstrates using RenderScript to perform basic image manipulation. Specifically, it allows users
 to dynamically adjust the saturation for an image using a slider. A custom RenderScript kernel performs the saturation
-adjustment, running the computation on the device's GPU or other compute hardware as deemed appropriate by the system.
+adjustment, running the computation on the device\'s GPU or other compute hardware as deemed appropriate by the system.
 
 Introduction
 ------------
@@ -28,7 +28,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/build.gradle b/prebuilts/gradle/BasicSyncAdapter/Application/build.gradle
index 292c2d1..c0e52fa 100644
--- a/prebuilts/gradle/BasicSyncAdapter/Application/build.gradle
+++ b/prebuilts/gradle/BasicSyncAdapter/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:gridlayout-v7:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java
index da67107..78d5865 100644
--- a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java
+++ b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java
@@ -250,9 +250,9 @@
                     // Update existing record
                     Log.i(TAG, "Scheduling update: " + existingUri);
                     batch.add(ContentProviderOperation.newUpdate(existingUri)
-                            .withValue(FeedContract.Entry.COLUMN_NAME_TITLE, title)
-                            .withValue(FeedContract.Entry.COLUMN_NAME_LINK, link)
-                            .withValue(FeedContract.Entry.COLUMN_NAME_PUBLISHED, published)
+                            .withValue(FeedContract.Entry.COLUMN_NAME_TITLE, match.title)
+                            .withValue(FeedContract.Entry.COLUMN_NAME_LINK, match.link)
+                            .withValue(FeedContract.Entry.COLUMN_NAME_PUBLISHED, match.published)
                             .build());
                     syncResult.stats.numUpdates++;
                 } else {
diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java b/prebuilts/gradle/BasicSyncAdapter/Application/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java
index 08798ba..eea75d7 100644
--- a/prebuilts/gradle/BasicSyncAdapter/Application/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java
+++ b/prebuilts/gradle/BasicSyncAdapter/Application/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,13 +22,13 @@
 /**
 * Tests for BasicSyncAdapter sample.
 */
-public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
+public class SampleTests extends ActivityInstrumentationTestCase2<EntryListActivity> {
 
-    private MainActivity mTestActivity;
-    private BasicSyncAdapterFragment mTestFragment;
+    private EntryListActivity mTestActivity;
+    private EntryListFragment mTestFragment;
 
     public SampleTests() {
-        super(MainActivity.class);
+        super(EntryListActivity.class);
     }
 
     @Override
@@ -58,8 +40,8 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (BasicSyncAdapterFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
+        mTestFragment = (EntryListFragment)
+            mTestActivity.getSupportFragmentManager().getFragments().get(0);
     }
 
     /**
@@ -76,4 +58,4 @@
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/BasicSyncAdapter/README.md b/prebuilts/gradle/BasicSyncAdapter/README.md
index c490009..337bdb7 100644
--- a/prebuilts/gradle/BasicSyncAdapter/README.md
+++ b/prebuilts/gradle/BasicSyncAdapter/README.md
@@ -28,7 +28,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BasicTransition/Application/build.gradle b/prebuilts/gradle/BasicTransition/Application/build.gradle
index c6b8c26..d7a41be 100644
--- a/prebuilts/gradle/BasicTransition/Application/build.gradle
+++ b/prebuilts/gradle/BasicTransition/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 19
diff --git a/prebuilts/gradle/BasicTransition/README.md b/prebuilts/gradle/BasicTransition/README.md
index 51f22cb..3194bf3 100644
--- a/prebuilts/gradle/BasicTransition/README.md
+++ b/prebuilts/gradle/BasicTransition/README.md
@@ -33,7 +33,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BatchStepSensor/Application/build.gradle b/prebuilts/gradle/BatchStepSensor/Application/build.gradle
index c6b8c26..d7a41be 100644
--- a/prebuilts/gradle/BatchStepSensor/Application/build.gradle
+++ b/prebuilts/gradle/BatchStepSensor/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 19
diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/activity_main.xml
old mode 100755
new mode 100644
diff --git a/prebuilts/gradle/BatchStepSensor/README.md b/prebuilts/gradle/BatchStepSensor/README.md
index c7dff78..f5383a2 100644
--- a/prebuilts/gradle/BatchStepSensor/README.md
+++ b/prebuilts/gradle/BatchStepSensor/README.md
@@ -31,7 +31,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/AdapterTransition/.google/packaging.yaml b/prebuilts/gradle/BeamLargeFiles/.google/packaging.yaml
similarity index 81%
rename from prebuilts/gradle/AdapterTransition/.google/packaging.yaml
rename to prebuilts/gradle/BeamLargeFiles/.google/packaging.yaml
index 593e3f8..e04c40a 100644
--- a/prebuilts/gradle/AdapterTransition/.google/packaging.yaml
+++ b/prebuilts/gradle/BeamLargeFiles/.google/packaging.yaml
@@ -5,8 +5,8 @@
 ---
 status:       PUBLISHED
 technologies: [Android]
-categories:   [UI]
+categories:   [Connectivity]
 languages:    [Java]
 solutions:    [Mobile]
-github:       android-AdapterTransition
+github:       android-BeamLargeFiles
 license: apache2
diff --git a/prebuilts/gradle/AdapterTransition/Application/build.gradle b/prebuilts/gradle/BeamLargeFiles/Application/build.gradle
similarity index 94%
rename from prebuilts/gradle/AdapterTransition/Application/build.gradle
rename to prebuilts/gradle/BeamLargeFiles/Application/build.gradle
index c6b8c26..d17046c 100644
--- a/prebuilts/gradle/AdapterTransition/Application/build.gradle
+++ b/prebuilts/gradle/BeamLargeFiles/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,10 +30,10 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 16
         targetSdkVersion 21
     }
 
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..b084253
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/AndroidManifest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2013 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.beamlargefiles"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <!-- Large file beam requires API 16 or above. -->
+    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
+
+    <!-- The NFC permission is required to use NfcAdapter. -->
+    <uses-permission android:name="android.permission.NFC" />
+    <!-- Inform app distribution channels that NFC is used, though not required. -->
+    <!-- (This step is optional, but recommended.) -->
+    <uses-feature android:name="android.hardware.nfc" android:required="false" />
+
+    <application android:allowBackup="true"
+        android:label="@string/app_name"
+        android:icon="@drawable/ic_launcher"
+        android:theme="@style/AppTheme">
+
+        <!-- Main activity -->
+        <activity android:name=".MainActivity"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <!-- Content provider, used to provide images for transmission. -->
+        <provider
+            android:name="com.example.android.common.assetprovider.AssetProvider"
+            android:authorities="com.example.android.beamlargefiles.files"
+            android:exported="true"/>
+
+    </application>
+
+
+</manifest>
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/assets/stargazer_droid.jpg b/prebuilts/gradle/BeamLargeFiles/Application/src/main/assets/stargazer_droid.jpg
new file mode 100644
index 0000000..e336b32
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/assets/stargazer_droid.jpg
Binary files differ
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/beamlargefiles/BeamLargeFilesFragment.java b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/beamlargefiles/BeamLargeFilesFragment.java
new file mode 100644
index 0000000..6dd50fe
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/beamlargefiles/BeamLargeFilesFragment.java
@@ -0,0 +1,98 @@
+/*
+* Copyright (C) 2013 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.example.android.beamlargefiles;
+
+import android.app.Activity;
+import android.net.Uri;
+import android.nfc.NfcAdapter;
+import android.nfc.NfcEvent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.util.Log;
+
+/**
+ * This class demonstrates how to use Beam to send files too large to transfer reliably via NFC.
+ *
+ * <p>While any type of data can be placed into a normal NDEF messages, NFC is not considered
+ * "high-speed" communication channel. Large images can easily take > 30 seconds to transfer.
+ * Because NFC requires devices to be in extremely close proximity, this is not ideal.
+ *
+ * <p>Instead, Android 4.2+ devices can use NFC to perform an initial handshake, before handing
+ * off to a faster communication channel, such as Bluetooth, for file transfer.
+ *
+ * <p>The tradeoff is that this application will not be invoked on the receiving device. Instead,
+ * the transfer will be handled by the OS. The user will be shown a notification when the transfer
+ * is complete. Selecting the notification will open the file in the default viewer for its MIME-
+ * type. (If it's important that your application be used to open the file, you'll need to register
+ * an intent-filter to watch for the appropriate MIME-type.)
+ */
+public class BeamLargeFilesFragment extends Fragment implements NfcAdapter.CreateBeamUrisCallback {
+
+    private static final String TAG = "BeamLargeFilesFragment";
+    /** Filename that is to be sent for this activity. Relative to /assets. */
+    private static final String FILENAME = "stargazer_droid.jpg";
+    /** Content provider URI. */
+    private static final String CONTENT_BASE_URI =
+            "content://com.example.android.beamlargefiles.files/";
+
+    /**
+     * Standard lifecycle event. Registers a callback for large-file transfer, by calling
+     * NfcAdapter.setBeamPushUrisCallback().
+     *
+     * Note: Like sending NDEF messages over standard Android Beam, there is also a non-callback
+     * API available. See: NfcAdapter.setBeamPushUris().
+     *
+     * @param savedInstanceState Saved instance state.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+        Activity a = getActivity();
+
+        // Setup Beam to transfer a large file. Note the call to setBeamPushUrisCallback().
+        // BEGIN_INCLUDE(setBeamPushUrisCallback)
+        NfcAdapter nfc = NfcAdapter.getDefaultAdapter(a);
+        if (nfc != null) {
+            Log.w(TAG, "NFC available. Setting Beam Push URI callback");
+            nfc.setBeamPushUrisCallback(this, a);
+        } else {
+            Log.w(TAG, "NFC is not available");
+        }
+        // END_INCLUDE(setBeamPushUrisCallback)
+    }
+
+    /**
+     * Callback for Beam events (large file version). The return value here should be an array of
+     * content:// or file:// URIs to send.
+     *
+     * Note that the system must have read access to whatever URIs are provided here.
+     *
+     * @param nfcEvent NFC event which triggered callback
+     * @return URIs to be sent to remote device
+     */
+    // BEGIN_INCLUDE(createBeamUris)
+    @Override
+    public Uri[] createBeamUris(NfcEvent nfcEvent) {
+        Log.i(TAG, "Beam event in progress; createBeamUris() called.");
+        // Images are served using a content:// URI. See AssetProvider for implementation.
+        Uri photoUri = Uri.parse(CONTENT_BASE_URI + FILENAME);
+        Log.i(TAG, "Sending URI: " + photoUri);
+        return new Uri[] {photoUri};
+    }
+    // END_INCLUDE(createBeamUris)
+}
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/beamlargefiles/MainActivity.java b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/beamlargefiles/MainActivity.java
new file mode 100644
index 0000000..50d504c
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/beamlargefiles/MainActivity.java
@@ -0,0 +1,82 @@
+/*
+* Copyright 2013 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.example.android.beamlargefiles;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.text.Html;
+import android.widget.TextView;
+import android.view.Menu;
+
+import com.example.android.common.activities.SampleActivityBase;
+import com.example.android.common.logger.Log;
+import com.example.android.common.logger.LogFragment;
+import com.example.android.common.logger.LogWrapper;
+import com.example.android.common.logger.MessageOnlyLogFilter;
+
+/**
+ * A simple launcher activity containing a summary sample description
+ * and a few action bar buttons.
+ */
+public class MainActivity extends SampleActivityBase {
+
+    public static final String TAG = "MainActivity";
+
+    public static final String FRAGTAG = "BeamLargeFilesFragment";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        TextView sampleOutput = (TextView) findViewById(R.id.sample_output);
+        sampleOutput.setText(Html.fromHtml(getString(R.string.intro_message)));
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        BeamLargeFilesFragment fragment = new BeamLargeFilesFragment();
+        transaction.add(fragment, FRAGTAG);
+        transaction.commit();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.main, menu);
+        return true;
+    }
+
+    /** Create a chain of targets that will receive log data */
+    @Override
+    public void initializeLogging() {
+        // Wraps Android's native log framework.
+        LogWrapper logWrapper = new LogWrapper();
+        // Using Log, front-end to the logging chain, emulates android.util.log method signatures.
+        Log.setLogNode(logWrapper);
+
+        // Filter strips out everything except the message text.
+        MessageOnlyLogFilter msgFilter = new MessageOnlyLogFilter();
+        logWrapper.setNext(msgFilter);
+
+        // On screen logging via a fragment with a TextView.
+        LogFragment logFragment = (LogFragment) getSupportFragmentManager()
+                .findFragmentById(R.id.log_fragment);
+        msgFilter.setNext(logFragment.getLogView());
+        logFragment.getLogView().setTextAppearance(this, R.style.Log);
+        logFragment.getLogView().setBackgroundColor(Color.WHITE);
+
+        Log.i(TAG, "Ready");
+    }
+}
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/assetprovider/AssetProvider.java b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/assetprovider/AssetProvider.java
new file mode 100644
index 0000000..f6c0f61
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/assetprovider/AssetProvider.java
@@ -0,0 +1,140 @@
+/*
+* Copyright (C) 2013 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.example.android.common.assetprovider;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.res.AssetFileDescriptor;
+import android.content.res.AssetManager;
+import android.database.Cursor;
+import android.net.Uri;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import static java.net.URLConnection.guessContentTypeFromName;
+
+/**
+ * Generic content provider, which makes any files available in this app's "assets" directory
+ * available publicly.
+ *
+ * <p>To use, add the following to your AndroidManifest.xml:
+ *
+ * <code><pre>
+ * <provider
+ *   android:name=".AssetProvider"
+ *   android:authorities="[YOUR CONTENT PROVIDER DOMAIN HERE]"
+ *   android:exported="true"/>
+ * </pre></code>
+ */
+public class AssetProvider extends ContentProvider {
+    AssetManager mAssets;
+
+    @Override
+    public boolean onCreate() {
+        Context ctx = getContext();
+        if (ctx == null) {
+            // Context not available. Give up.
+            return false;
+        }
+        mAssets = ctx.getAssets();
+        return true;
+    }
+
+    @Override
+    public String getType(Uri uri){
+        // Returns the MIME type for the selected URI, in conformance with the ContentProvider
+        // interface. Looks up the file indicated by /res/assets/{uri.path}, and returns the MIME
+        // type for that file as guessed by the URLConnection class.
+
+        // Setup
+        String path = uri.getPath();
+
+        // Check if file exists
+        if (!fileExists(path)) {
+            return null;
+        }
+
+        // Determine MIME-type based on filename
+        return guessContentTypeFromName(uri.toString());
+    }
+
+
+    @Override
+    public AssetFileDescriptor openAssetFile (Uri uri, String mode)
+            throws FileNotFoundException, SecurityException {
+        // ContentProvider interface for opening a file descriptor by URI. This content provider
+        // maps all URIs to the contents of the APK's assets folder, so a file handle to
+        // /res/assets/{uri.path} will be returned.
+
+        // Security check. This content provider only supports read-only access. (Also, the contents
+        // of an APKs assets folder are immutable, so read-write access doesn't make sense here.)
+        if (!"r".equals(mode)) {
+            throw new SecurityException("Only read-only access is supported, mode must be [r]");
+        }
+
+        // Open asset from within APK and return file descriptor
+        String path = uri.getPath();
+        try {
+            return mAssets.openFd(path);
+        } catch (IOException e) {
+            throw new FileNotFoundException();
+        }
+    }
+
+    /**
+     * Check if file exists inside APK assets.
+     *
+     * @param path Fully qualified path to file.
+     * @return true if exists, false otherwise.
+     */
+    private boolean fileExists(String path) {
+        try {
+            // Check to see if file can be opened. If so, file exists.
+            mAssets.openFd(path).close();
+            return true;
+        } catch (IOException e) {
+            // Unable to open file descriptor for specified path; file doesn't exist.
+            return false;
+        }
+    }
+
+    // Required/unused ContentProvider methods below.
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection,
+                        String[] selectionArgs, String sortOrder) {
+        // Note: It might be worth implementing support for querying
+        //       android.provider.OpenableColumns here in the future.
+        throw new RuntimeException("Operation not supported");
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues contentValues) {
+        throw new RuntimeException("Operation not supported");
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        throw new RuntimeException("Operation not supported");
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        throw new RuntimeException("Operation not supported");
+    }
+}
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/Log.java
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/LogFragment.java
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/LogNode.java
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/LogView.java
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/Flashlight/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..b1efaf4
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..f5f9244
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..5d07b3f
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..6ef21e1
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/layout-sw600dp-land/activity_main.xml
new file mode 100644
index 0000000..8fed5f7
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/layout-sw600dp-land/activity_main.xml
@@ -0,0 +1,42 @@
+<!--
+  Copyright 2013 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.
+  -->
+<ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:id="@+id/sample_main_layout">
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+        <TextView android:id="@+id/sample_output"
+                  style="@style/Widget.SampleMessage"
+                  android:background="@android:color/white"
+                  android:layout_weight="1"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:text="@string/intro_message"
+                  android:layout_margin="16dp" />
+        <fragment
+                android:name="com.example.android.common.logger.LogFragment"
+                android:id="@+id/log_fragment"
+                android:layout_weight="1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="16dp" />
+    </LinearLayout>
+</ScrollView>
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/layout-sw600dp/activity_main.xml
new file mode 100644
index 0000000..f811ef7
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/layout-sw600dp/activity_main.xml
@@ -0,0 +1,40 @@
+<!--
+  Copyright 2013 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.
+  -->
+<ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:id="@+id/sample_main_layout">
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+        <TextView android:id="@+id/sample_output"
+                style="@style/Widget.SampleMessage"
+                android:background="@android:color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                android:layout_margin="16dp"/>
+        <fragment
+                android:name="com.example.android.common.logger.LogFragment"
+                android:id="@+id/log_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="16dp" />
+    </LinearLayout>
+</ScrollView>
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..d170958
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/layout/activity_main.xml
@@ -0,0 +1,43 @@
+<!--
+  Copyright 2013 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.
+  -->
+<ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:id="@+id/sample_main_layout">
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+        <TextView android:id="@+id/sample_output"
+                style="@style/Widget.SampleMessage"
+                android:layout_weight="1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="16dp" />
+        <View
+                android:layout_width="fill_parent"
+                android:layout_height="1dp"
+                android:background="@android:color/darker_gray"/>
+        <fragment
+                android:name="com.example.android.common.logger.LogFragment"
+                android:id="@+id/log_fragment"
+                android:layout_weight="1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+    </LinearLayout>
+</ScrollView>
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/menu/main.xml
similarity index 75%
rename from prebuilts/gradle/Flashlight/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/res/menu/main.xml
index 8c1ea66..8de3baa 100644
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/values-v11/template-styles.xml
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/menu/main.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013 The Android Open Source Project
+  Copyright 2014 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.
@@ -14,9 +14,5 @@
   limitations under the License.
   -->
 
-<resources>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" />
 
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Holo.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-v21/base-colors.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values-v21/base-colors.xml
similarity index 100%
rename from prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-v21/base-colors.xml
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values-v21/base-colors.xml
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-v21/base-template-styles.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values-v21/base-template-styles.xml
similarity index 100%
rename from prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-v21/base-template-styles.xml
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values-v21/base-template-styles.xml
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values/base-strings.xml
new file mode 100644
index 0000000..6b2c69a
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values/base-strings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2013 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.
+-->
+<resources>
+    <string name="app_name">BeamLargeFiles</string>
+    <string name="intro_message">
+        <![CDATA[
+        
+            
+            This sample demonstrates how to transfer large files via Android Beam. After the initial
+            handshake over NFC, file transfer will take place over a secondary high-speed
+            communication channel such as Bluetooth or WiFi Direct.
+
+            \n\nThis feature requires Android 4.1 (Jelly Bean) or above. Unlike traditional Beam,
+            your application will not receive an Intent on the receiving device. Instead, the system
+            will save the file to disk and display a notification that the user can select to open
+            the file using a standard ACTION_VIEW Intent.
+            
+        
+        ]]>
+    </string>
+</resources>
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/EmbeddedApp/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values/template-styles.xml
similarity index 64%
rename from prebuilts/gradle/Flashlight/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values/template-styles.xml
index 6e7d593..cfffcbd 100644
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/values/template-styles.xml
+++ b/prebuilts/gradle/BeamLargeFiles/Application/src/main/res/values/template-styles.xml
@@ -18,18 +18,19 @@
 
     <!-- Activity themes -->
 
-    <style name="Theme.Base" parent="android:Theme.Light" />
+    <style name="Theme.Base" parent="android:Theme.Holo.Light" />
 
-    <style name="Theme.Sample" parent="Theme.Base" />
-
-    <style name="AppTheme" parent="Theme.Sample" />
+    <style name="AppTheme" parent="Theme.Base" />
     <!-- Widget styling -->
 
     <style name="Widget" />
 
     <style name="Widget.SampleMessage">
+        <item name="android:padding">@dimen/margin_medium</item>
         <item name="android:textAppearance">?android:textAppearanceMedium</item>
         <item name="android:lineSpacingMultiplier">1.1</item>
+        <item name="android:layout_margin">16dp</item>
+        <item name="android:shadowDy">-6.5</item>
     </style>
 
     <style name="Widget.SampleMessageTile">
@@ -39,4 +40,15 @@
         <item name="android:shadowRadius">2</item>
     </style>
 
+
+    <style name="Widget.SampleOutput">
+        <item name="android:padding">@dimen/margin_medium</item>
+        <item name="android:textAppearance">?android:textAppearanceMedium</item>
+        <item name="android:lineSpacingMultiplier">1.1</item>
+    </style>
+
+    <style name="Log" parent="Widget.SampleOutput">
+        <item name="android:typeface">monospace</item>
+    </style>
+
 </resources>
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/tests/AndroidManifest.xml b/prebuilts/gradle/BeamLargeFiles/Application/tests/AndroidManifest.xml
new file mode 100644
index 0000000..bd10d6f
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/tests/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2013 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 name must be unique so suffix with "tests" so package loader doesn't ignore us -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.example.android.beamlargefiles.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
+
+    <!-- We add an application tag here just so that we can indicate that
+         this package needs to link against the android.test library,
+         which is needed when building test cases. -->
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <!--
+    Specifies the instrumentation test runner used to run the tests.
+    -->
+    <instrumentation
+            android:name="android.test.InstrumentationTestRunner"
+            android:targetPackage="com.example.android.beamlargefiles"
+            android:label="Tests for com.example.android.beamlargefiles" />
+
+</manifest>
\ No newline at end of file
diff --git a/prebuilts/gradle/BeamLargeFiles/Application/tests/src/com/example/android/beamlargefiles/tests/SampleTests.java b/prebuilts/gradle/BeamLargeFiles/Application/tests/src/com/example/android/beamlargefiles/tests/SampleTests.java
new file mode 100644
index 0000000..c64a767
--- /dev/null
+++ b/prebuilts/gradle/BeamLargeFiles/Application/tests/src/com/example/android/beamlargefiles/tests/SampleTests.java
@@ -0,0 +1,76 @@
+/*
+* Copyright 2013 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.
+*/
+/*
+* Copyright (C) 2013 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.example.android.beamlargefiles.tests;
+
+import com.example.android.beamlargefiles.*;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+/**
+* Tests for BeamLargeFiles sample.
+*/
+public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
+
+    private MainActivity mTestActivity;
+    private BeamLargeFilesFragment mTestFragment;
+
+    public SampleTests() {
+        super(MainActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        // Starts the activity under test using the default Intent with:
+        // action = {@link Intent#ACTION_MAIN}
+        // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
+        // All other fields are null or empty.
+        mTestActivity = getActivity();
+        mTestFragment = (BeamLargeFilesFragment)
+            mTestActivity.getSupportFragmentManager().getFragments().get(1);
+    }
+
+    /**
+    * Test if the test fixture has been set up correctly.
+    */
+    public void testPreconditions() {
+        //Try to add a message to add context to your assertions. These messages will be shown if
+        //a tests fails and make it easy to understand why a test failed
+        assertNotNull("mTestActivity is null", mTestActivity);
+        assertNotNull("mTestFragment is null", mTestFragment);
+    }
+
+    /**
+    * Add more tests below.
+    */
+
+}
\ No newline at end of file
diff --git a/prebuilts/gradle/EmbeddedApp/CONTRIBUTING.md b/prebuilts/gradle/BeamLargeFiles/CONTRIBUTING.md
similarity index 100%
copy from prebuilts/gradle/EmbeddedApp/CONTRIBUTING.md
copy to prebuilts/gradle/BeamLargeFiles/CONTRIBUTING.md
diff --git a/prebuilts/gradle/EmbeddedApp/LICENSE b/prebuilts/gradle/BeamLargeFiles/LICENSE
similarity index 100%
copy from prebuilts/gradle/EmbeddedApp/LICENSE
copy to prebuilts/gradle/BeamLargeFiles/LICENSE
diff --git a/prebuilts/gradle/EmbeddedApp/NOTICE b/prebuilts/gradle/BeamLargeFiles/NOTICE
similarity index 100%
copy from prebuilts/gradle/EmbeddedApp/NOTICE
copy to prebuilts/gradle/BeamLargeFiles/NOTICE
diff --git a/prebuilts/gradle/AdapterTransition/README.md b/prebuilts/gradle/BeamLargeFiles/README.md
similarity index 69%
rename from prebuilts/gradle/AdapterTransition/README.md
rename to prebuilts/gradle/BeamLargeFiles/README.md
index 71a9ef8..8b445f0 100644
--- a/prebuilts/gradle/AdapterTransition/README.md
+++ b/prebuilts/gradle/BeamLargeFiles/README.md
@@ -1,13 +1,21 @@
-Android AdapterTransition Sample
+Android BeamLargeFiles Sample
 ===================================
 
-Transition cannot be directly applied to AdapterViews. In this sample, we demonstrate how to create an overlay layout and run a Transition on it. Press the action bar button to toggle between ListView and GridView.
+This sample demonstrates how to transfer large files via Android Beam. After the initial
+handshake over NFC, file transfer will take place over a secondary high-speed
+communication channel such as Bluetooth or WiFi Direct.
+
+
+This feature requires Android 4.1 (Jelly Bean) or above. Unlike traditional Beam,
+your application will not receive an Intent on the receiving device. Instead, the system
+will save the file to disk and display a notification that the user can select to open
+the file using a standard ACTION_VIEW Intent.
 
 Pre-requisites
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
@@ -23,7 +31,7 @@
 - Stack Overflow: http://stackoverflow.com/questions/tagged/android
 
 If you've found an error in this sample, please file an issue:
-https://github.com/googlesamples/android-AdapterTransition
+https://github.com/googlesamples/android-BeamLargeFiles
 
 Patches are encouraged, and may be submitted by forking this project and
 submitting a pull request through GitHub. Please see CONTRIBUTING.md for more details.
diff --git a/prebuilts/gradle/AdapterTransition/build.gradle b/prebuilts/gradle/BeamLargeFiles/build.gradle
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/build.gradle
rename to prebuilts/gradle/BeamLargeFiles/build.gradle
diff --git a/prebuilts/gradle/EmbeddedApp/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/BeamLargeFiles/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
copy from prebuilts/gradle/EmbeddedApp/gradle/wrapper/gradle-wrapper.jar
copy to prebuilts/gradle/BeamLargeFiles/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BeamLargeFiles/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from prebuilts/gradle/EmbeddedApp/gradle/wrapper/gradle-wrapper.properties
rename to prebuilts/gradle/BeamLargeFiles/gradle/wrapper/gradle-wrapper.properties
diff --git a/prebuilts/gradle/EmbeddedApp/gradlew b/prebuilts/gradle/BeamLargeFiles/gradlew
similarity index 100%
copy from prebuilts/gradle/EmbeddedApp/gradlew
copy to prebuilts/gradle/BeamLargeFiles/gradlew
diff --git a/prebuilts/gradle/AdapterTransition/gradlew.bat b/prebuilts/gradle/BeamLargeFiles/gradlew.bat
old mode 100644
new mode 100755
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/gradlew.bat
rename to prebuilts/gradle/BeamLargeFiles/gradlew.bat
diff --git a/prebuilts/gradle/AdapterTransition/settings.gradle b/prebuilts/gradle/BeamLargeFiles/settings.gradle
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/settings.gradle
rename to prebuilts/gradle/BeamLargeFiles/settings.gradle
diff --git a/prebuilts/gradle/BluetoothChat/Application/build.gradle b/prebuilts/gradle/BluetoothChat/Application/build.gradle
index 8b72299..92f5366 100644
--- a/prebuilts/gradle/BluetoothChat/Application/build.gradle
+++ b/prebuilts/gradle/BluetoothChat/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:gridlayout-v7:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 11
diff --git a/prebuilts/gradle/BluetoothChat/README.md b/prebuilts/gradle/BluetoothChat/README.md
index 9467517..16f9966 100644
--- a/prebuilts/gradle/BluetoothChat/README.md
+++ b/prebuilts/gradle/BluetoothChat/README.md
@@ -32,7 +32,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/build.gradle b/prebuilts/gradle/BluetoothLeGatt/Application/build.gradle
index 3859b3e..4d71f5f 100644
--- a/prebuilts/gradle/BluetoothLeGatt/Application/build.gradle
+++ b/prebuilts/gradle/BluetoothLeGatt/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 18
diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BluetoothLeGatt/README.md b/prebuilts/gradle/BluetoothLeGatt/README.md
index 593fe14..acf83d3 100644
--- a/prebuilts/gradle/BluetoothLeGatt/README.md
+++ b/prebuilts/gradle/BluetoothLeGatt/README.md
@@ -23,7 +23,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/BorderlessButtons/Application/build.gradle b/prebuilts/gradle/BorderlessButtons/Application/build.gradle
index 37884d8..dc5222c 100644
--- a/prebuilts/gradle/BorderlessButtons/Application/build.gradle
+++ b/prebuilts/gradle/BorderlessButtons/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 14
diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/BorderlessButtons/README.md b/prebuilts/gradle/BorderlessButtons/README.md
index 3177580..d4bb12c 100644
--- a/prebuilts/gradle/BorderlessButtons/README.md
+++ b/prebuilts/gradle/BorderlessButtons/README.md
@@ -24,7 +24,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/Camera2Basic/Application/build.gradle b/prebuilts/gradle/Camera2Basic/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/Camera2Basic/Application/build.gradle
+++ b/prebuilts/gradle/Camera2Basic/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/Camera2Basic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/Camera2Basic/Application/tests/AndroidManifest.xml
index 8b29c81..6c6aa11 100644
--- a/prebuilts/gradle/Camera2Basic/Application/tests/AndroidManifest.xml
+++ b/prebuilts/gradle/Camera2Basic/Application/tests/AndroidManifest.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-
-
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright (C) 2013 The Android Open Source Project
@@ -56,4 +37,4 @@
             android:targetPackage="com.example.android.camera2basic"
             android:label="Tests for com.example.android.camera2basic" />
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/prebuilts/gradle/Camera2Basic/Application/tests/src/com/example/android/camera2basic/tests/SampleTests.java b/prebuilts/gradle/Camera2Basic/Application/tests/src/com/example/android/camera2basic/tests/SampleTests.java
index 44cdfeb..52ee523 100644
--- a/prebuilts/gradle/Camera2Basic/Application/tests/src/com/example/android/camera2basic/tests/SampleTests.java
+++ b/prebuilts/gradle/Camera2Basic/Application/tests/src/com/example/android/camera2basic/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<CameraActivity> {
 
     private CameraActivity mTestActivity;
-    private Camera2BasicFragment mTestFragment;
 
     public SampleTests() {
         super(CameraActivity.class);
@@ -58,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (Camera2BasicFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/Camera2Basic/README.md b/prebuilts/gradle/Camera2Basic/README.md
index b848e02..97da446 100644
--- a/prebuilts/gradle/Camera2Basic/README.md
+++ b/prebuilts/gradle/Camera2Basic/README.md
@@ -42,7 +42,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/Camera2Video/Application/build.gradle b/prebuilts/gradle/Camera2Video/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/Camera2Video/Application/build.gradle
+++ b/prebuilts/gradle/Camera2Video/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/Camera2Video/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/Camera2Video/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/Camera2Video/README.md b/prebuilts/gradle/Camera2Video/README.md
index 52dd730..7c2a5e5 100644
--- a/prebuilts/gradle/Camera2Video/README.md
+++ b/prebuilts/gradle/Camera2Video/README.md
@@ -43,7 +43,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/CardEmulation/Application/build.gradle b/prebuilts/gradle/CardEmulation/Application/build.gradle
index c6b8c26..d7a41be 100644
--- a/prebuilts/gradle/CardEmulation/Application/build.gradle
+++ b/prebuilts/gradle/CardEmulation/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 19
diff --git a/prebuilts/gradle/CardEmulation/Application/tests/AndroidManifest.xml b/prebuilts/gradle/CardEmulation/Application/tests/AndroidManifest.xml
index d1ec341..8ff5bf8 100644
--- a/prebuilts/gradle/CardEmulation/Application/tests/AndroidManifest.xml
+++ b/prebuilts/gradle/CardEmulation/Application/tests/AndroidManifest.xml
@@ -16,7 +16,7 @@
   -->
 <!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="${sample.package}.tests"
+          package="com.example.android.cardemulation.tests"
           android:versionCode="1"
           android:versionName="1.0">
 
diff --git a/prebuilts/gradle/CardEmulation/README.md b/prebuilts/gradle/CardEmulation/README.md
index ce885e9..80c5fa5 100644
--- a/prebuilts/gradle/CardEmulation/README.md
+++ b/prebuilts/gradle/CardEmulation/README.md
@@ -12,7 +12,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
diff --git a/prebuilts/gradle/CardReader/Application/build.gradle b/prebuilts/gradle/CardReader/Application/build.gradle
index c6b8c26..d7a41be 100644
--- a/prebuilts/gradle/CardReader/Application/build.gradle
+++ b/prebuilts/gradle/CardReader/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 19
diff --git a/prebuilts/gradle/CardReader/Application/tests/AndroidManifest.xml b/prebuilts/gradle/CardReader/Application/tests/AndroidManifest.xml
index fd702fc..0e31a3b 100644
--- a/prebuilts/gradle/CardReader/Application/tests/AndroidManifest.xml
+++ b/prebuilts/gradle/CardReader/Application/tests/AndroidManifest.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-
-
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright (C) 2013 The Android Open Source Project
@@ -56,4 +37,4 @@
             android:targetPackage="com.example.android.cardreader"
             android:label="Tests for com.example.android.cardreader" />
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/prebuilts/gradle/CardReader/README.md b/prebuilts/gradle/CardReader/README.md
index 0eaa5e0..725166c 100644
--- a/prebuilts/gradle/CardReader/README.md
+++ b/prebuilts/gradle/CardReader/README.md
@@ -13,7 +13,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
diff --git a/prebuilts/gradle/CardView/Application/build.gradle b/prebuilts/gradle/CardView/Application/build.gradle
index 13964de..9ded333 100644
--- a/prebuilts/gradle/CardView/Application/build.gradle
+++ b/prebuilts/gradle/CardView/Application/build.gradle
@@ -14,10 +14,7 @@
     jcenter()
 }
 
-
 dependencies {
-
-
     compile "com.android.support:cardview-v7:21.0.2"
 }
 
@@ -31,7 +28,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/CardView/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CardView/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/CardView/Application/tests/AndroidManifest.xml b/prebuilts/gradle/CardView/Application/tests/AndroidManifest.xml
index 92cfd40..8f1171d 100644
--- a/prebuilts/gradle/CardView/Application/tests/AndroidManifest.xml
+++ b/prebuilts/gradle/CardView/Application/tests/AndroidManifest.xml
@@ -34,7 +34,6 @@
     -->
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"
-        android:label="Tests for CardView sample"
         android:targetPackage="com.example.android.cardview"/>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/prebuilts/gradle/CardView/README.md b/prebuilts/gradle/CardView/README.md
index 9b59602..2edc995 100644
--- a/prebuilts/gradle/CardView/README.md
+++ b/prebuilts/gradle/CardView/README.md
@@ -8,7 +8,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
diff --git a/prebuilts/gradle/ClippingBasic/Application/build.gradle b/prebuilts/gradle/ClippingBasic/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/ClippingBasic/Application/build.gradle
+++ b/prebuilts/gradle/ClippingBasic/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/ClippingBasic/README.md b/prebuilts/gradle/ClippingBasic/README.md
index 966fc2d..871e3eb 100644
--- a/prebuilts/gradle/ClippingBasic/README.md
+++ b/prebuilts/gradle/ClippingBasic/README.md
@@ -47,7 +47,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/CustomChoiceList/Application/build.gradle b/prebuilts/gradle/CustomChoiceList/Application/build.gradle
index 76169de..e1be69a 100644
--- a/prebuilts/gradle/CustomChoiceList/Application/build.gradle
+++ b/prebuilts/gradle/CustomChoiceList/Application/build.gradle
@@ -14,11 +14,8 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -31,7 +28,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 4
diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/CustomChoiceList/README.md b/prebuilts/gradle/CustomChoiceList/README.md
index df7f8a7..f47b378 100644
--- a/prebuilts/gradle/CustomChoiceList/README.md
+++ b/prebuilts/gradle/CustomChoiceList/README.md
@@ -41,7 +41,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/CustomNotifications/Application/build.gradle b/prebuilts/gradle/CustomNotifications/Application/build.gradle
index 76169de..e1be69a 100644
--- a/prebuilts/gradle/CustomNotifications/Application/build.gradle
+++ b/prebuilts/gradle/CustomNotifications/Application/build.gradle
@@ -14,11 +14,8 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -31,7 +28,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 4
diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/CustomNotifications/README.md b/prebuilts/gradle/CustomNotifications/README.md
index a5da801..c86700e 100644
--- a/prebuilts/gradle/CustomNotifications/README.md
+++ b/prebuilts/gradle/CustomNotifications/README.md
@@ -25,7 +25,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/CustomTransition/Application/build.gradle b/prebuilts/gradle/CustomTransition/Application/build.gradle
index c6b8c26..d7a41be 100644
--- a/prebuilts/gradle/CustomTransition/Application/build.gradle
+++ b/prebuilts/gradle/CustomTransition/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 19
diff --git a/prebuilts/gradle/CustomTransition/README.md b/prebuilts/gradle/CustomTransition/README.md
index 0ad4d3c..a76d70f 100644
--- a/prebuilts/gradle/CustomTransition/README.md
+++ b/prebuilts/gradle/CustomTransition/README.md
@@ -32,7 +32,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/DataLayer/Application/build.gradle b/prebuilts/gradle/DataLayer/Application/build.gradle
index 5a8cfd3..e8f9f0d 100644
--- a/prebuilts/gradle/DataLayer/Application/build.gradle
+++ b/prebuilts/gradle/DataLayer/Application/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
@@ -10,10 +10,14 @@
 
 apply plugin: 'com.android.application'
 
+repositories {
+    jcenter()
+}
 
 dependencies {
-
-
+    compile "com.android.support:support-v4:21.0.2"
+    compile "com.android.support:support-v13:21.0.2"
+    compile "com.android.support:cardview-v7:21.0.2"
     compile 'com.google.android.gms:play-services-wearable:6.5.+'
     compile 'com.android.support:support-v13:21.0.+'
     wearApp project(':Wearable')
@@ -29,14 +33,11 @@
 
 android {
     compileSdkVersion 21
-
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
     }
 
     sourceSets {
diff --git a/prebuilts/gradle/DataLayer/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/DataLayer/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/DataLayer/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/DataLayer/README.md b/prebuilts/gradle/DataLayer/README.md
index 4b2efea..dc68ec8 100644
--- a/prebuilts/gradle/DataLayer/README.md
+++ b/prebuilts/gradle/DataLayer/README.md
@@ -27,7 +27,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/DataLayer/Wearable/build.gradle b/prebuilts/gradle/DataLayer/Wearable/build.gradle
index a207d2c..2b9b845 100644
--- a/prebuilts/gradle/DataLayer/Wearable/build.gradle
+++ b/prebuilts/gradle/DataLayer/Wearable/build.gradle
@@ -31,7 +31,7 @@
 android {
     compileSdkVersion 21
 
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         versionCode 1
diff --git a/prebuilts/gradle/DelayedConfirmation/Application/build.gradle b/prebuilts/gradle/DelayedConfirmation/Application/build.gradle
index 5a8cfd3..e8f9f0d 100644
--- a/prebuilts/gradle/DelayedConfirmation/Application/build.gradle
+++ b/prebuilts/gradle/DelayedConfirmation/Application/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
@@ -10,10 +10,14 @@
 
 apply plugin: 'com.android.application'
 
+repositories {
+    jcenter()
+}
 
 dependencies {
-
-
+    compile "com.android.support:support-v4:21.0.2"
+    compile "com.android.support:support-v13:21.0.2"
+    compile "com.android.support:cardview-v7:21.0.2"
     compile 'com.google.android.gms:play-services-wearable:6.5.+'
     compile 'com.android.support:support-v13:21.0.+'
     wearApp project(':Wearable')
@@ -29,14 +33,11 @@
 
 android {
     compileSdkVersion 21
-
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
     }
 
     sourceSets {
diff --git a/prebuilts/gradle/DelayedConfirmation/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/DelayedConfirmation/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/DelayedConfirmation/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/DelayedConfirmation/README.md b/prebuilts/gradle/DelayedConfirmation/README.md
index 363d187..cac7b2a 100644
--- a/prebuilts/gradle/DelayedConfirmation/README.md
+++ b/prebuilts/gradle/DelayedConfirmation/README.md
@@ -12,7 +12,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
diff --git a/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle b/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle
index a207d2c..2b9b845 100644
--- a/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle
+++ b/prebuilts/gradle/DelayedConfirmation/Wearable/build.gradle
@@ -31,7 +31,7 @@
 android {
     compileSdkVersion 21
 
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         versionCode 1
diff --git a/prebuilts/gradle/FragmentTransition/.google/packaging.yaml b/prebuilts/gradle/DeviceOwner/.google/packaging.yaml
similarity index 64%
rename from prebuilts/gradle/FragmentTransition/.google/packaging.yaml
rename to prebuilts/gradle/DeviceOwner/.google/packaging.yaml
index 5756d0a..e6c9e8b 100644
--- a/prebuilts/gradle/FragmentTransition/.google/packaging.yaml
+++ b/prebuilts/gradle/DeviceOwner/.google/packaging.yaml
@@ -5,14 +5,13 @@
 ---
 status:       PUBLISHED
 technologies: [Android]
-categories:   [Transition, UI]
+categories:   [Device Admin]
 languages:    [Java]
 solutions:    [Mobile]
-github:       android-FragmentTransition
+github:       android-DeviceOwner
 level:        ADVANCED
 icon:         screenshots/icon-web.png
 apiRefs:
-    - android:android.transition.TransitionManager
-    - android:android.transition.Transition
-    - android:android.transition.Scene
+    - android:android.app.admin.DevicePolicyManager
+    - android:android.provider.Settings
 license: apache2
diff --git a/prebuilts/gradle/AdapterTransition/Application/build.gradle b/prebuilts/gradle/DeviceOwner/Application/build.gradle
similarity index 94%
copy from prebuilts/gradle/AdapterTransition/Application/build.gradle
copy to prebuilts/gradle/DeviceOwner/Application/build.gradle
index c6b8c26..fe4d074 100644
--- a/prebuilts/gradle/AdapterTransition/Application/build.gradle
+++ b/prebuilts/gradle/DeviceOwner/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,10 +30,10 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 21
     }
 
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..fb61ac9
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/AndroidManifest.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2015 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.
+-->
+<manifest
+    package="com.example.android.deviceowner"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <receiver
+            android:name=".DeviceOwnerReceiver"
+            android:description="@string/app_name"
+            android:label="@string/app_name"
+            android:permission="android.permission.BIND_DEVICE_ADMIN">
+            <meta-data
+                android:name="android.app.device_admin"
+                android:resource="@xml/device_owner_receiver"/>
+            <intent-filter>
+                <action android:name="android.app.action.PROFILE_PROVISIONING_COMPLETE"/>
+            </intent-filter>
+        </receiver>
+
+    </application>
+
+
+</manifest>
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/DeviceOwnerFragment.java b/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/DeviceOwnerFragment.java
new file mode 100644
index 0000000..b5c6254
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/DeviceOwnerFragment.java
@@ -0,0 +1,334 @@
+/*
+ * Copyright (C) 2015 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.example.android.deviceowner;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.SimpleAdapter;
+import android.widget.Spinner;
+import android.widget.Switch;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Demonstrates the usage of the most common device management APIs for the device owner case.
+ * In addition to various features available for profile owners, device owners can perform extra
+ * actions, such as configuring global settings and enforcing a preferred Activity for a specific
+ * IntentFilter.
+ */
+public class DeviceOwnerFragment extends Fragment {
+
+    // Keys for SharedPreferences
+    private static final String PREFS_DEVICE_OWNER = "DeviceOwnerFragment";
+    private static final String PREF_LAUNCHER = "launcher";
+
+    private DevicePolicyManager mDevicePolicyManager;
+
+    // View references
+    private Switch mSwitchAutoTime;
+    private Switch mSwitchAutoTimeZone;
+    private Spinner mAvailableLaunchers;
+    private Button mButtonLauncher;
+
+    // Adapter for the spinner to show list of available launchers
+    private LauncherAdapter mAdapter;
+
+    /**
+     * Handles events on the Switches.
+     */
+    private Switch.OnCheckedChangeListener mOnCheckedChangeListener
+            = new Switch.OnCheckedChangeListener() {
+
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            switch (buttonView.getId()) {
+                case R.id.switch_auto_time:
+                    setBooleanGlobalSetting(Settings.Global.AUTO_TIME, isChecked);
+                    retrieveCurrentSettings(getActivity());
+                    break;
+                case R.id.switch_auto_time_zone:
+                    setBooleanGlobalSetting(Settings.Global.AUTO_TIME_ZONE, isChecked);
+                    retrieveCurrentSettings(getActivity());
+                    break;
+            }
+        }
+
+    };
+
+    /**
+     * Handles click events on the Button.
+     */
+    private View.OnClickListener mOnClickListener
+            = new View.OnClickListener() {
+
+        @Override
+        public void onClick(View v) {
+            switch (v.getId()) {
+                case R.id.set_preferred_launcher:
+                    if (loadPersistentPreferredLauncher(getActivity()) == null) {
+                        setPreferredLauncher();
+                    } else {
+                        clearPreferredLauncher();
+                    }
+                    retrieveCurrentSettings(getActivity());
+                    break;
+            }
+        }
+
+    };
+
+    /**
+     * @return A newly instantiated {@link DeviceOwnerFragment}.
+     */
+    public static DeviceOwnerFragment newInstance() {
+        return new DeviceOwnerFragment();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_device_owner, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        // Retain references
+        mSwitchAutoTime = (Switch) view.findViewById(R.id.switch_auto_time);
+        mSwitchAutoTimeZone = (Switch) view.findViewById(R.id.switch_auto_time_zone);
+        mAvailableLaunchers = (Spinner) view.findViewById(R.id.available_launchers);
+        mButtonLauncher = (Button) view.findViewById(R.id.set_preferred_launcher);
+        // Bind event handlers
+        mSwitchAutoTime.setOnCheckedChangeListener(mOnCheckedChangeListener);
+        mSwitchAutoTimeZone.setOnCheckedChangeListener(mOnCheckedChangeListener);
+        mButtonLauncher.setOnClickListener(mOnClickListener);
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mDevicePolicyManager =
+                (DevicePolicyManager) activity.getSystemService(Activity.DEVICE_POLICY_SERVICE);
+    }
+
+    @Override
+    public void onDetach() {
+        mDevicePolicyManager = null;
+        super.onDetach();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Activity activity = getActivity();
+        if (activity != null) {
+            retrieveCurrentSettings(activity);
+        }
+    }
+
+    /**
+     * Retrieves the current global settings and changes the UI accordingly.
+     *
+     * @param activity The activity
+     */
+    private void retrieveCurrentSettings(Activity activity) {
+        // Global settings
+        setCheckedSafely(mSwitchAutoTime,
+                getBooleanGlobalSetting(activity.getContentResolver(), Settings.Global.AUTO_TIME));
+        setCheckedSafely(mSwitchAutoTimeZone,
+                getBooleanGlobalSetting(activity.getContentResolver(),
+                        Settings.Global.AUTO_TIME_ZONE));
+
+        // Launcher
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.addCategory(Intent.CATEGORY_HOME);
+        List<ResolveInfo> list = activity.getPackageManager()
+                .queryIntentActivities(intent, /* default flags */ 0);
+        mAdapter = new LauncherAdapter(activity, list);
+        mAvailableLaunchers.setAdapter(mAdapter);
+        String packageName = loadPersistentPreferredLauncher(activity);
+        if (packageName == null) { // No preferred launcher is set
+            mAvailableLaunchers.setEnabled(true);
+            mButtonLauncher.setText(R.string.set_as_preferred);
+        } else {
+            int position = -1;
+            for (int i = 0; i < list.size(); ++i) {
+                if (list.get(i).activityInfo.packageName.equals(packageName)) {
+                    position = i;
+                    break;
+                }
+            }
+            if (position != -1) {
+                mAvailableLaunchers.setSelection(position);
+                mAvailableLaunchers.setEnabled(false);
+                mButtonLauncher.setText(R.string.clear_preferred);
+            }
+        }
+    }
+
+    /**
+     * Retrieves the current boolean value of the specified global setting.
+     *
+     * @param resolver The ContentResolver
+     * @param setting  The setting to be retrieved
+     * @return The current boolean value
+     */
+    private static boolean getBooleanGlobalSetting(ContentResolver resolver, String setting) {
+        return 0 != Settings.Global.getInt(resolver, setting, 0);
+    }
+
+    /**
+     * Sets the boolean value of the specified global setting.
+     *
+     * @param setting The setting to be set
+     * @param value   The value to be set
+     */
+    private void setBooleanGlobalSetting(String setting, boolean value) {
+        mDevicePolicyManager.setGlobalSetting(
+                // The ComponentName of the device owner
+                DeviceOwnerReceiver.getComponentName(getActivity()),
+                // The settings to be set
+                setting,
+                // The value we write here is a string representation for SQLite
+                value ? "1" : "0");
+    }
+
+    /**
+     * A utility method to set the checked state of the button without invoking its listener.
+     *
+     * @param button  The button
+     * @param checked The value to be set
+     */
+    private void setCheckedSafely(CompoundButton button, boolean checked) {
+        button.setOnCheckedChangeListener(null);
+        button.setChecked(checked);
+        button.setOnCheckedChangeListener(mOnCheckedChangeListener);
+    }
+
+    /**
+     * Loads the package name from SharedPreferences.
+     *
+     * @param activity The activity
+     * @return The package name of the launcher currently set as preferred, or null if there is no
+     * preferred launcher.
+     */
+    private static String loadPersistentPreferredLauncher(Activity activity) {
+        return activity.getSharedPreferences(PREFS_DEVICE_OWNER, Context.MODE_PRIVATE)
+                .getString(PREF_LAUNCHER, null);
+    }
+
+    /**
+     * Saves the package name into SharedPreferences.
+     *
+     * @param activity    The activity
+     * @param packageName The package name to be saved. Pass null to remove the preferred launcher.
+     */
+    private static void savePersistentPreferredLauncher(Activity activity, String packageName) {
+        SharedPreferences.Editor editor = activity.getSharedPreferences(PREFS_DEVICE_OWNER,
+                Context.MODE_PRIVATE).edit();
+        if (packageName == null) {
+            editor.remove(PREF_LAUNCHER);
+        } else {
+            editor.putString(PREF_LAUNCHER, packageName);
+        }
+        editor.apply();
+    }
+
+    /**
+     * Sets the selected launcher as preferred.
+     */
+    private void setPreferredLauncher() {
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+        IntentFilter filter = new IntentFilter(Intent.ACTION_MAIN);
+        filter.addCategory(Intent.CATEGORY_HOME);
+        filter.addCategory(Intent.CATEGORY_DEFAULT);
+        ComponentName componentName = mAdapter.getComponentName(
+                mAvailableLaunchers.getSelectedItemPosition());
+        mDevicePolicyManager.addPersistentPreferredActivity(
+                DeviceOwnerReceiver.getComponentName(activity), filter, componentName);
+        savePersistentPreferredLauncher(activity, componentName.getPackageName());
+    }
+
+    /**
+     * Clears the launcher currently set as preferred.
+     */
+    private void clearPreferredLauncher() {
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+        mDevicePolicyManager.clearPackagePersistentPreferredActivities(
+                DeviceOwnerReceiver.getComponentName(activity),
+                loadPersistentPreferredLauncher(activity));
+        savePersistentPreferredLauncher(activity, null);
+    }
+
+    /**
+     * Shows list of {@link ResolveInfo} in a {@link Spinner}.
+     */
+    private static class LauncherAdapter extends SimpleAdapter {
+
+        private static final String KEY_PACKAGE_NAME = "package_name";
+        private static final String KEY_ACTIVITY_NAME = "activity_name";
+
+        public LauncherAdapter(Context context, List<ResolveInfo> list) {
+            super(context, createData(list), android.R.layout.simple_list_item_1,
+                    new String[]{KEY_PACKAGE_NAME},
+                    new int[]{android.R.id.text1});
+        }
+
+        private static List<HashMap<String, String>> createData(List<ResolveInfo> list) {
+            List<HashMap<String, String>> data = new ArrayList<>();
+            for (ResolveInfo info : list) {
+                HashMap<String, String> map = new HashMap<>();
+                map.put(KEY_PACKAGE_NAME, info.activityInfo.packageName);
+                map.put(KEY_ACTIVITY_NAME, info.activityInfo.name);
+                data.add(map);
+            }
+            return data;
+        }
+
+        public ComponentName getComponentName(int position) {
+            @SuppressWarnings("unchecked")
+            HashMap<String, String> map = (HashMap<String, String>) getItem(position);
+            return new ComponentName(map.get(KEY_PACKAGE_NAME), map.get(KEY_ACTIVITY_NAME));
+        }
+
+    }
+
+}
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/DeviceOwnerReceiver.java b/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/DeviceOwnerReceiver.java
new file mode 100644
index 0000000..f5969fc
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/DeviceOwnerReceiver.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2015 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.example.android.deviceowner;
+
+import android.app.admin.DeviceAdminReceiver;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Handles events related to device owner.
+ */
+public class DeviceOwnerReceiver extends DeviceAdminReceiver {
+
+    /**
+     * Called on the new profile when device owner provisioning has completed. Device owner
+     * provisioning is the process of setting up the device so that its main profile is managed by
+     * the mobile device management (MDM) application set up as the device owner.
+     */
+    @Override
+    public void onProfileProvisioningComplete(Context context, Intent intent) {
+        // Enable the profile
+        DevicePolicyManager manager =
+                (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        ComponentName componentName = getComponentName(context);
+        manager.setProfileName(componentName, context.getString(R.string.profile_name));
+        // Open the main screen
+        Intent launch = new Intent(context, MainActivity.class);
+        launch.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(launch);
+    }
+
+    /**
+     * @return A newly instantiated {@link android.content.ComponentName} for this
+     * DeviceAdminReceiver.
+     */
+    public static ComponentName getComponentName(Context context) {
+        return new ComponentName(context.getApplicationContext(), DeviceOwnerReceiver.class);
+    }
+
+}
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/InstructionFragment.java b/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/InstructionFragment.java
new file mode 100644
index 0000000..2a889c3
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/InstructionFragment.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2015 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.example.android.deviceowner;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Shows instruction about this device owner.
+ */
+public class InstructionFragment extends Fragment {
+
+    /**
+     * @return A newly instantiated {@link InstructionFragment}.
+     */
+    public static InstructionFragment newInstance() {
+        return new InstructionFragment();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_instruction, container, false);
+    }
+
+}
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/MainActivity.java b/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/MainActivity.java
new file mode 100644
index 0000000..5a331ab
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/java/com/example/android/deviceowner/MainActivity.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 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.example.android.deviceowner;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+
+public class MainActivity extends Activity {
+
+    private static final String TAG = "MainActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main_real);
+        if (savedInstanceState == null) {
+            DevicePolicyManager manager =
+                    (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+            if (manager.isDeviceOwnerApp(getApplicationContext().getPackageName())) {
+                // This app is set up as the device owner. Show the main features.
+                Log.d(TAG, "The app is the device owner.");
+                showFragment(DeviceOwnerFragment.newInstance());
+            } else {
+                // This app is not set up as the device owner. Show instructions.
+                Log.d(TAG, "The app is not the device owner.");
+                showFragment(InstructionFragment.newInstance());
+            }
+        }
+    }
+
+    private void showFragment(Fragment fragment) {
+        getFragmentManager().beginTransaction()
+                .replace(R.id.container, fragment)
+                .commit();
+    }
+
+}
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..282e540
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/GridViewPager/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/GridViewPager/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-hdpi/tile.9.png
Binary files differ
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..4ecfdf6
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..dfb6cab
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..650302e
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/res/layout/activity_main_real.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/layout/activity_main_real.xml
new file mode 100644
index 0000000..384e9f9
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/res/layout/activity_main_real.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2015 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.
+-->
+<FrameLayout
+    android:id="@+id/container"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.example.android.deviceowner.MainActivity"
+    tools:ignore="MergeRootFrame"/>
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/res/layout/fragment_device_owner.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/layout/fragment_device_owner.xml
new file mode 100644
index 0000000..aeae219
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/res/layout/fragment_device_owner.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2015 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.
+-->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.example.android.deviceowner.DeviceOwnerFragment">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_medium"
+            android:text="@string/label_global_settings"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+        <Switch
+            android:id="@+id/switch_auto_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_medium"
+            android:paddingEnd="@dimen/margin_medium"
+            android:paddingStart="@dimen/margin_medium"
+            android:text="@string/label_auto_time"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+        <Switch
+            android:id="@+id/switch_auto_time_zone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_medium"
+            android:paddingEnd="@dimen/margin_medium"
+            android:paddingStart="@dimen/margin_medium"
+            android:text="@string/label_auto_time_zone"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/margin_medium"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/margin_medium"
+            android:text="@string/label_launcher"
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+        <Spinner
+            android:id="@+id/available_launchers"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_medium"
+            android:layout_marginTop="@dimen/margin_medium"/>
+
+        <Button
+            android:id="@+id/set_preferred_launcher"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_medium"
+            android:text="@string/set_as_preferred"/>
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/res/layout/fragment_instruction.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/layout/fragment_instruction.xml
new file mode 100644
index 0000000..9d09e39
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/res/layout/fragment_instruction.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2015 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.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.example.android.deviceowner.InstructionFragment">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/margin_medium"
+        android:text="@string/set_up_instruction"
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+</LinearLayout>
diff --git a/prebuilts/gradle/Timer/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/Timer/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/DeviceOwner/Application/src/main/res/values-sw600dp/template-dimens.xml
diff --git a/prebuilts/gradle/Timer/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/Timer/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/DeviceOwner/Application/src/main/res/values-sw600dp/template-styles.xml
diff --git a/prebuilts/gradle/Timer/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/Timer/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/DeviceOwner/Application/src/main/res/values-v11/template-styles.xml
diff --git a/prebuilts/gradle/Timer/Application/src/main/res/values-v21/base-colors.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/values-v21/base-colors.xml
similarity index 100%
rename from prebuilts/gradle/Timer/Application/src/main/res/values-v21/base-colors.xml
rename to prebuilts/gradle/DeviceOwner/Application/src/main/res/values-v21/base-colors.xml
diff --git a/prebuilts/gradle/Timer/Application/src/main/res/values-v21/base-template-styles.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/values-v21/base-template-styles.xml
similarity index 100%
rename from prebuilts/gradle/Timer/Application/src/main/res/values-v21/base-template-styles.xml
rename to prebuilts/gradle/DeviceOwner/Application/src/main/res/values-v21/base-template-styles.xml
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/values/base-strings.xml
similarity index 66%
copy from prebuilts/gradle/Flashlight/Application/src/main/res/values/base-strings.xml
copy to prebuilts/gradle/DeviceOwner/Application/src/main/res/values/base-strings.xml
index f0f3d9d..71d41f7 100644
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/values/base-strings.xml
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/res/values/base-strings.xml
@@ -15,14 +15,16 @@
  limitations under the License.
 -->
 <resources>
-    <string name="app_name">Flashlight</string>
+    <string name="app_name">DeviceOwner</string>
     <string name="intro_message">
         <![CDATA[
         
-            
-            Wearable activity that uses your wearable screen as a flashlight. There is also
-            a party-mode option, if you want to make things interesting.
-            
+
+This app demonstrates how to use device owner features. Use the NfcProvisioning sample to set up
+this app as the device owner of your test device (This requires wiping out the device and resseting
+it as an unprovisioned device). As a device owner, this app can configure global settings, and
+enforce use of a specific launcher.
+
         
         ]]>
     </string>
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/res/values/strings.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/values/strings.xml
new file mode 100644
index 0000000..af7d038
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/res/values/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2015 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.
+-->
+<resources>
+
+    <string name="set_up_instruction">
+        The app is not set up as the device owner of this device. Use NfcProvisioning sample to set
+        up this app as the device owner of this device (This requires factory resetting the device).
+    </string>
+
+    <string name="profile_name">Sample Device Owner</string>
+
+    <string name="label_global_settings">Global settings</string>
+    <string name="label_auto_time">Automatic date &amp; time</string>
+    <string name="label_auto_time_zone">Automatic time zone</string>
+
+    <string name="label_launcher">Home Launcher</string>
+    <string name="set_as_preferred">Set as preferred</string>
+    <string name="clear_preferred">Clear preferred</string>
+
+</resources>
diff --git a/prebuilts/gradle/Timer/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/Timer/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/DeviceOwner/Application/src/main/res/values/template-dimens.xml
diff --git a/prebuilts/gradle/Timer/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/Timer/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/DeviceOwner/Application/src/main/res/values/template-styles.xml
diff --git a/prebuilts/gradle/DeviceOwner/Application/src/main/res/xml/device_owner_receiver.xml b/prebuilts/gradle/DeviceOwner/Application/src/main/res/xml/device_owner_receiver.xml
new file mode 100644
index 0000000..20109f0
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/Application/src/main/res/xml/device_owner_receiver.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2015 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.
+-->
+<device-admin>
+    <uses-policies>
+        <limit-password/>
+        <watch-login/>
+        <reset-password/>
+        <force-lock/>
+        <wipe-data/>
+        <expire-password/>
+        <encrypted-storage/>
+        <disable-camera/>
+    </uses-policies>
+</device-admin>
diff --git a/prebuilts/gradle/EmbeddedApp/CONTRIBUTING.md b/prebuilts/gradle/DeviceOwner/CONTRIBUTING.md
similarity index 100%
rename from prebuilts/gradle/EmbeddedApp/CONTRIBUTING.md
rename to prebuilts/gradle/DeviceOwner/CONTRIBUTING.md
diff --git a/prebuilts/gradle/EmbeddedApp/LICENSE b/prebuilts/gradle/DeviceOwner/LICENSE
similarity index 100%
rename from prebuilts/gradle/EmbeddedApp/LICENSE
rename to prebuilts/gradle/DeviceOwner/LICENSE
diff --git a/prebuilts/gradle/EmbeddedApp/NOTICE b/prebuilts/gradle/DeviceOwner/NOTICE
similarity index 100%
rename from prebuilts/gradle/EmbeddedApp/NOTICE
rename to prebuilts/gradle/DeviceOwner/NOTICE
diff --git a/prebuilts/gradle/DeviceOwner/README.md b/prebuilts/gradle/DeviceOwner/README.md
new file mode 100644
index 0000000..e469ecb
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/README.md
@@ -0,0 +1,77 @@
+Android DeviceOwner Sample
+===================================
+
+This sample demonstrates how to use some device owner features. As a device owner, you can configure
+global settings such as automatic time and timezone. You can mandate a specific launcher by
+preferred intent handler.
+
+Introduction
+------------
+
+In order to set global settings, use [DevicePolicyManager#setGlobalSetting][1] and specify one of
+the [Settings.Global][2] keys available. Note that you need to specify its value as a String. As
+most of the keys accept boolean values, you will mostly use "1" for true and "0" for false.
+
+You can mandate a specific launcher by adding a persistent preferred activity for an IntentFilter
+with Intent.CATEGORY_HOME category. Call [DevicePolicyManager#addPersistentPreferredActivity][3] to
+register the activity. You can clear the registration with
+[clearPackagePersistentPreferredActivities][4].
+
+As a device owner, you can also use the features available for managed profile owner. See
+[BasicManagedProfile][5].
+
+[1]: http://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String)
+[2]: http://developer.android.com/reference/android/provider/Settings.Global.html
+[3]: http://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#addPersistentPreferredActivity(android.content.ComponentName, android.content.IntentFilter, android.content.ComponentName)
+[4]: http://developer.android.com/reference/android/app/admin/DevicePolicyManager.html#clearPackagePersistentPreferredActivities(android.content.ComponentName, java.lang.String)
+[5]: https://developer.android.com/samples/BasicManagedProfile/index.html
+
+Pre-requisites
+--------------
+
+- Android SDK v21
+- Android Build Tools v21.1.2
+- Android Support Repository
+
+Screenshots
+-------------
+
+<img src="screenshots/1-main.png" height="400" alt="Screenshot"/> 
+
+Getting Started
+---------------
+
+This sample uses the Gradle build system. To build this project, use the
+"gradlew build" command or use "Import Project" in Android Studio.
+
+Support
+-------
+
+- Google+ Community: https://plus.google.com/communities/105153134372062985968
+- Stack Overflow: http://stackoverflow.com/questions/tagged/android
+
+If you've found an error in this sample, please file an issue:
+https://github.com/googlesamples/android-DeviceOwner
+
+Patches are encouraged, and may be submitted by forking this project and
+submitting a pull request through GitHub. Please see CONTRIBUTING.md for more details.
+
+License
+-------
+
+Copyright 2014 The Android Open Source Project, Inc.
+
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements.  See the NOTICE file distributed with this work for
+additional information regarding copyright ownership.  The ASF licenses this
+file to you 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.
diff --git a/prebuilts/gradle/FragmentTransition/build.gradle b/prebuilts/gradle/DeviceOwner/build.gradle
similarity index 90%
rename from prebuilts/gradle/FragmentTransition/build.gradle
rename to prebuilts/gradle/DeviceOwner/build.gradle
index 584ba87..1dac6de 100644
--- a/prebuilts/gradle/FragmentTransition/build.gradle
+++ b/prebuilts/gradle/DeviceOwner/build.gradle
@@ -8,3 +8,4 @@
 
 
 
+
diff --git a/prebuilts/gradle/EmbeddedApp/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/DeviceOwner/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from prebuilts/gradle/EmbeddedApp/gradle/wrapper/gradle-wrapper.jar
rename to prebuilts/gradle/DeviceOwner/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/DeviceOwner/gradle/wrapper/gradle-wrapper.properties
similarity index 86%
rename from prebuilts/gradle/AdapterTransition/gradle/wrapper/gradle-wrapper.properties
rename to prebuilts/gradle/DeviceOwner/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..0973c31 100644
--- a/prebuilts/gradle/AdapterTransition/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/DeviceOwner/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Tue Jan 20 16:50:15 JST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/prebuilts/gradle/EmbeddedApp/gradlew b/prebuilts/gradle/DeviceOwner/gradlew
similarity index 100%
rename from prebuilts/gradle/EmbeddedApp/gradlew
rename to prebuilts/gradle/DeviceOwner/gradlew
diff --git a/prebuilts/gradle/AdapterTransition/gradlew.bat b/prebuilts/gradle/DeviceOwner/gradlew.bat
similarity index 100%
copy from prebuilts/gradle/AdapterTransition/gradlew.bat
copy to prebuilts/gradle/DeviceOwner/gradlew.bat
diff --git a/prebuilts/gradle/DeviceOwner/screenshots/1-main.png b/prebuilts/gradle/DeviceOwner/screenshots/1-main.png
new file mode 100644
index 0000000..db827d1
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/screenshots/1-main.png
Binary files differ
diff --git a/prebuilts/gradle/DeviceOwner/screenshots/icon-web.png b/prebuilts/gradle/DeviceOwner/screenshots/icon-web.png
new file mode 100755
index 0000000..ac670da
--- /dev/null
+++ b/prebuilts/gradle/DeviceOwner/screenshots/icon-web.png
Binary files differ
diff --git a/prebuilts/gradle/AdapterTransition/settings.gradle b/prebuilts/gradle/DeviceOwner/settings.gradle
similarity index 100%
copy from prebuilts/gradle/AdapterTransition/settings.gradle
copy to prebuilts/gradle/DeviceOwner/settings.gradle
diff --git a/prebuilts/gradle/DirectorySelection/Application/Application.iml b/prebuilts/gradle/DirectorySelection/Application/Application.iml
deleted file mode 100644
index 6ae0f75..0000000
--- a/prebuilts/gradle/DirectorySelection/Application/Application.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
diff --git a/prebuilts/gradle/DirectorySelection/Application/build.gradle b/prebuilts/gradle/DirectorySelection/Application/build.gradle
index 6bd132f..0976ca2 100644
--- a/prebuilts/gradle/DirectorySelection/Application/build.gradle
+++ b/prebuilts/gradle/DirectorySelection/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
     compile "com.android.support:recyclerview-v7:+"
 }
 
@@ -34,7 +31,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/DirectorySelection/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/DirectorySelection/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/DirectorySelection/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/DirectorySelection/README.md b/prebuilts/gradle/DirectorySelection/README.md
index 1d3fb33..0a6eccc 100644
--- a/prebuilts/gradle/DirectorySelection/README.md
+++ b/prebuilts/gradle/DirectorySelection/README.md
@@ -107,7 +107,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/build.gradle b/prebuilts/gradle/DisplayingBitmaps/Application/build.gradle
index 292c2d1..c0e52fa 100644
--- a/prebuilts/gradle/DisplayingBitmaps/Application/build.gradle
+++ b/prebuilts/gradle/DisplayingBitmaps/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:gridlayout-v7:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 7
diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/tests/AndroidManifest.xml b/prebuilts/gradle/DisplayingBitmaps/Application/tests/AndroidManifest.xml
index a93e21f..779a3e3 100644
--- a/prebuilts/gradle/DisplayingBitmaps/Application/tests/AndroidManifest.xml
+++ b/prebuilts/gradle/DisplayingBitmaps/Application/tests/AndroidManifest.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-
-
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright (C) 2013 The Android Open Source Project
@@ -56,4 +37,4 @@
             android:targetPackage="com.example.android.displayingbitmaps"
             android:label="Tests for com.example.android.displayingbitmaps" />
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java b/prebuilts/gradle/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
index f295856..2d2ca68 100644
--- a/prebuilts/gradle/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
+++ b/prebuilts/gradle/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,20 +15,19 @@
 */
 package com.example.android.displayingbitmaps.tests;
 
-import com.example.android.displayingbitmaps.*;
+import com.example.android.displayingbitmaps.ui.ImageGridActivity;
 
 import android.test.ActivityInstrumentationTestCase2;
 
 /**
 * Tests for DisplayingBitmaps sample.
 */
-public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
+public class SampleTests extends ActivityInstrumentationTestCase2<ImageGridActivity> {
 
-    private MainActivity mTestActivity;
-    private DisplayingBitmapsFragment mTestFragment;
+    private ImageGridActivity mTestActivity;
 
     public SampleTests() {
-        super(MainActivity.class);
+        super(ImageGridActivity.class);
     }
 
     @Override
@@ -58,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (DisplayingBitmapsFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/DisplayingBitmaps/README.md b/prebuilts/gradle/DisplayingBitmaps/README.md
index d5e8c22..a47b5e0 100644
--- a/prebuilts/gradle/DisplayingBitmaps/README.md
+++ b/prebuilts/gradle/DisplayingBitmaps/README.md
@@ -20,7 +20,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/DocumentCentricApps/Application/build.gradle b/prebuilts/gradle/DocumentCentricApps/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/DocumentCentricApps/Application/build.gradle
+++ b/prebuilts/gradle/DocumentCentricApps/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/DocumentCentricApps/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/DocumentCentricApps/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/DocumentCentricApps/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/DocumentCentricApps/README.md b/prebuilts/gradle/DocumentCentricApps/README.md
index 1415279..406a7d5 100644
--- a/prebuilts/gradle/DocumentCentricApps/README.md
+++ b/prebuilts/gradle/DocumentCentricApps/README.md
@@ -25,7 +25,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/DocumentCentricRelinquishIdentity/Application/build.gradle b/prebuilts/gradle/DocumentCentricRelinquishIdentity/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/DocumentCentricRelinquishIdentity/Application/build.gradle
+++ b/prebuilts/gradle/DocumentCentricRelinquishIdentity/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/DocumentCentricRelinquishIdentity/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/DocumentCentricRelinquishIdentity/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/DocumentCentricRelinquishIdentity/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/DocumentCentricRelinquishIdentity/README.md b/prebuilts/gradle/DocumentCentricRelinquishIdentity/README.md
index 7812f8a..0f6445f 100644
--- a/prebuilts/gradle/DocumentCentricRelinquishIdentity/README.md
+++ b/prebuilts/gradle/DocumentCentricRelinquishIdentity/README.md
@@ -7,7 +7,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
diff --git a/prebuilts/gradle/DoneBar/Application/build.gradle b/prebuilts/gradle/DoneBar/Application/build.gradle
index 37884d8..dc5222c 100644
--- a/prebuilts/gradle/DoneBar/Application/build.gradle
+++ b/prebuilts/gradle/DoneBar/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 14
diff --git a/prebuilts/gradle/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java b/prebuilts/gradle/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java
index c019ef8..b9b8443 100644
--- a/prebuilts/gradle/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java
+++ b/prebuilts/gradle/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +25,6 @@
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private DoneBarFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -58,8 +39,6 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (DoneBarFragment)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
     }
 
     /**
@@ -69,11 +48,10 @@
         //Try to add a message to add context to your assertions. These messages will be shown if
         //a tests fails and make it easy to understand why a test failed
         assertNotNull("mTestActivity is null", mTestActivity);
-        assertNotNull("mTestFragment is null", mTestFragment);
     }
 
     /**
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/DoneBar/README.md b/prebuilts/gradle/DoneBar/README.md
index 254879d..0174423 100644
--- a/prebuilts/gradle/DoneBar/README.md
+++ b/prebuilts/gradle/DoneBar/README.md
@@ -31,7 +31,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/DrawableTinting/Application/build.gradle b/prebuilts/gradle/DrawableTinting/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/DrawableTinting/Application/build.gradle
+++ b/prebuilts/gradle/DrawableTinting/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/DrawableTinting/README.md b/prebuilts/gradle/DrawableTinting/README.md
index da2ca32..7e9c09c 100644
--- a/prebuilts/gradle/DrawableTinting/README.md
+++ b/prebuilts/gradle/DrawableTinting/README.md
@@ -16,7 +16,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
diff --git a/prebuilts/gradle/ElevationBasic/Application/build.gradle b/prebuilts/gradle/ElevationBasic/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/ElevationBasic/Application/build.gradle
+++ b/prebuilts/gradle/ElevationBasic/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/ElevationBasic/README.md b/prebuilts/gradle/ElevationBasic/README.md
index afcfddf..5839045 100644
--- a/prebuilts/gradle/ElevationBasic/README.md
+++ b/prebuilts/gradle/ElevationBasic/README.md
@@ -41,7 +41,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/ElevationDrag/Application/build.gradle b/prebuilts/gradle/ElevationDrag/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/ElevationDrag/Application/build.gradle
+++ b/prebuilts/gradle/ElevationDrag/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/ElevationDrag/Application/tests/AndroidManifest.xml b/prebuilts/gradle/ElevationDrag/Application/tests/AndroidManifest.xml
index 60c9a19..fdde8fa 100644
--- a/prebuilts/gradle/ElevationDrag/Application/tests/AndroidManifest.xml
+++ b/prebuilts/gradle/ElevationDrag/Application/tests/AndroidManifest.xml
@@ -1,22 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-
-
-
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright (C) 2013 The Android Open Source Project
@@ -56,4 +37,4 @@
             android:targetPackage="com.example.android.elevationdrag"
             android:label="Tests for com.example.android.elevationdrag" />
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/prebuilts/gradle/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java b/prebuilts/gradle/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java
index 5e7acc0..4727233 100644
--- a/prebuilts/gradle/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java
+++ b/prebuilts/gradle/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java
@@ -1,22 +1,4 @@
 /*
-* Copyright 2013 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.
-*/
-
-
-
-/*
 * Copyright (C) 2013 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -110,4 +92,4 @@
             }
         });
     }
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/ElevationDrag/README.md b/prebuilts/gradle/ElevationDrag/README.md
index 0890f75..8d0cefb 100644
--- a/prebuilts/gradle/ElevationDrag/README.md
+++ b/prebuilts/gradle/ElevationDrag/README.md
@@ -24,7 +24,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/ElizaChat/Application/build.gradle b/prebuilts/gradle/ElizaChat/Application/build.gradle
index 3859b3e..4d71f5f 100644
--- a/prebuilts/gradle/ElizaChat/Application/build.gradle
+++ b/prebuilts/gradle/ElizaChat/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 18
diff --git a/prebuilts/gradle/ElizaChat/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ElizaChat/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/ElizaChat/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/ElizaChat/README.md b/prebuilts/gradle/ElizaChat/README.md
index 07f95e7..068ef77 100644
--- a/prebuilts/gradle/ElizaChat/README.md
+++ b/prebuilts/gradle/ElizaChat/README.md
@@ -67,7 +67,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/ElizaChat/settings.gradle b/prebuilts/gradle/ElizaChat/settings.gradle
index 360755c..0f81951 100644
--- a/prebuilts/gradle/ElizaChat/settings.gradle
+++ b/prebuilts/gradle/ElizaChat/settings.gradle
@@ -1 +1 @@
-include ':Application', ':Shared'
+include ':Application'
\ No newline at end of file
diff --git a/prebuilts/gradle/EmbeddedApp/.google/packaging.yaml b/prebuilts/gradle/EmbeddedApp/.google/packaging.yaml
deleted file mode 100644
index 2a54928..0000000
--- a/prebuilts/gradle/EmbeddedApp/.google/packaging.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# GOOGLE SAMPLE PACKAGING DATA
-#
-# This file is used by Google as part of our samples packaging process.
-# End users may safely ignore this file. It has no relevance to other systems.
----
-status:       PUBLISHED
-technologies: [Android]
-categories:   [Wearable]
-languages:    [Java]
-solutions:    [Mobile]
-github:       android-EmbeddedApp
-level:        BEGINNER
-icon:         src/main/res/drawable-xxhdpi/ic_launcher.png
-apiRefs:
-    - android:android.app.Activity
-license: apache2
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/EmbeddedApp/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index ee47ffe..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.embeddedapp" >
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@android:style/Theme.DeviceDefault.Light" >
-        <activity
-            android:name=".PhoneActivity"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/java/com/example/android/wearable/embeddedapp/PhoneActivity.java b/prebuilts/gradle/EmbeddedApp/Application/src/main/java/com/example/android/wearable/embeddedapp/PhoneActivity.java
deleted file mode 100644
index 5a2f5ca..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/java/com/example/android/wearable/embeddedapp/PhoneActivity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2014 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.example.android.wearable.embeddedapp;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class PhoneActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_phone);
-    }
-}
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index 589f229..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index 77dd571..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index fe34ebe..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100755
index ab80bcd..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/layout/activity_phone.xml b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/layout/activity_phone.xml
deleted file mode 100644
index 54ca57e..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/layout/activity_phone.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".PhoneActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="@string/welcome_message"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true" />
-</RelativeLayout>
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values-sw600dp/template-styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<resources>
-
-    <style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceLarge</item>
-        <item name="android:lineSpacingMultiplier">1.2</item>
-        <item name="android:shadowDy">-6.5</item>
-    </style>
-
-</resources>
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 46059ed..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values/base-strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-<resources>
-    <string name="app_name">EmbeddedApp</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            This simple app demonstrates how to embed a wearable app into a phone app.
-            
-        
-        ]]>
-    </string>
-</resources>
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values/dimens.xml
deleted file mode 100644
index a1e9cfe..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
diff --git a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values/strings.xml b/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values/strings.xml
deleted file mode 100644
index 05b6f12..0000000
--- a/prebuilts/gradle/EmbeddedApp/Application/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<resources>
-
-    <string name="welcome_message">
-        By installing the release build of this application, the corresponding wearable app should
-        automatically be installed on any connected wearable devices.
-    </string>
-
-</resources>
diff --git a/prebuilts/gradle/EmbeddedApp/CONTRIB.md b/prebuilts/gradle/EmbeddedApp/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/EmbeddedApp/CONTRIB.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# How to become a contributor and submit your own code
-
-## Contributor License Agreements
-
-We'd love to accept your sample apps and patches! Before we can take them, we
-have to jump a couple of legal hurdles.
-
-Please fill out either the individual or corporate Contributor License Agreement (CLA).
-
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an [individual CLA]
-    (https://developers.google.com/open-source/cla/individual).
-  * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a [corporate CLA]
-    (https://developers.google.com/open-source/cla/corporate).
-
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able to
-accept your pull requests.
-
-## Contributing A Patch
-
-1. Submit an issue describing your proposed change to the repo in question.
-1. The repo owner will respond to your issue promptly.
-1. If your proposed change is accepted, and you haven't already done so, sign a
-   Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
-1. Ensure that your code adheres to the existing style in the sample to which
-   you are contributing. Refer to the
-   [Android Code Style Guide]
-   (https://source.android.com/source/code-style.html) for the
-   recommended coding standards for this organization.
-1. Ensure that your code has an appropriate set of unit tests which all pass.
-1. Submit a pull request.
-
diff --git a/prebuilts/gradle/EmbeddedApp/README.md b/prebuilts/gradle/EmbeddedApp/README.md
deleted file mode 100644
index bbc8691..0000000
--- a/prebuilts/gradle/EmbeddedApp/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-Android EmbeddedApp Sample
-===================================
-
-This simple app demonstrates how to embed a wearable app into a phone app.
-
-Introduction
-------------
-
-Wearable apps can be installed directly onto Android Wear devices during development, using either a direct ADB
-connection or ADB-over-Bluetooth. However, when releasing your app to end users, you must package your
-wearable APK inside of a traditional APK for distribution via a paired phone.
-
-When end users install this APK onto their phone, the wearable APK will be automatically detected, extracted, and pushed
-to their any paired wearable devices.
-
-This sample demonstrates how to properly package a wearable app for release in this manner. The wearable app is inside
-the `Wearable` directory, and the phone app (which will be used as a container for distribution) is the `Application`
-directory. There is nothing special about these apps, other than the `wearApp` dependency in the (host) phone app's
-`build.gradle` file:
-
-```groovy
-dependencies {
-    compile 'com.google.android.gms:play-services-wearable:6.5.+'
-    wearApp project(':Wearable')
-}
-```
-
-This dependency will automatically package the wearable APK during a **release build** (e.g. using the "Build > Generate
-Signed APK..." command in Android Studio). Note that this packaging is **not** performed for debug builds for
-performance reasons. During development, your wearable and phone apps must still be pushed individually to their
-respective devices using an ADB connection.
-
-Pre-requisites
---------------
-
-- Android SDK v21
-- Android Build Tools v21.1.1
-- Android Support Repository
-
-Screenshots
--------------
-
-<img src="screenshots/embedded_wearable_app.png" height="400" alt="Screenshot"/> <img src="screenshots/phone_app.png" height="400" alt="Screenshot"/> 
-
-Getting Started
----------------
-
-This sample uses the Gradle build system. To build this project, use the
-"gradlew build" command or use "Import Project" in Android Studio.
-
-Support
--------
-
-- Google+ Community: https://plus.google.com/communities/105153134372062985968
-- Stack Overflow: http://stackoverflow.com/questions/tagged/android
-
-If you've found an error in this sample, please file an issue:
-https://github.com/googlesamples/android-EmbeddedApp
-
-Patches are encouraged, and may be submitted by forking this project and
-submitting a pull request through GitHub. Please see CONTRIBUTING.md for more details.
-
-License
--------
-
-Copyright 2014 The Android Open Source Project, Inc.
-
-Licensed to the Apache Software Foundation (ASF) under one or more contributor
-license agreements.  See the NOTICE file distributed with this work for
-additional information regarding copyright ownership.  The ASF licenses this
-file to you 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.
diff --git a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/AndroidManifest.xml b/prebuilts/gradle/EmbeddedApp/Wearable/src/main/AndroidManifest.xml
deleted file mode 100644
index 4863d66..0000000
--- a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.embeddedapp" >
-
-    <uses-sdk android:minSdkVersion="20"
-              android:targetSdkVersion="21" />
-
-    <uses-feature android:name="android.hardware.type.watch" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@android:style/Theme.DeviceDefault.Light" >
-        <activity
-            android:name=".WearableActivity"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/java/com/example/android/wearable/embeddedapp/WearableActivity.java b/prebuilts/gradle/EmbeddedApp/Wearable/src/main/java/com/example/android/wearable/embeddedapp/WearableActivity.java
deleted file mode 100644
index 3703f34..0000000
--- a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/java/com/example/android/wearable/embeddedapp/WearableActivity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2014 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.example.android.wearable.embeddedapp;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class WearableActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_wearable);
-    }
-}
diff --git a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index 589f229..0000000
--- a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index 77dd571..0000000
--- a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index fe34ebe..0000000
--- a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100755
index ab80bcd..0000000
--- a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/layout/activity_wearable.xml b/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/layout/activity_wearable.xml
deleted file mode 100644
index 1f6a78a..0000000
--- a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/layout/activity_wearable.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".WearableActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/welcome_message"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true" />
-</RelativeLayout>
diff --git a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/values/strings.xml b/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/values/strings.xml
deleted file mode 100644
index 1823c57..0000000
--- a/prebuilts/gradle/EmbeddedApp/Wearable/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<resources>
-
-    <string name="app_name">EmbeddedApp Sample</string>
-    <string name="welcome_message">
-        This wearable app should be automatically installed on wearable devices whenever the
-        release build of the corresponding phone app is installed.
-    </string>
-
-</resources>
diff --git a/prebuilts/gradle/EmbeddedApp/build.gradle b/prebuilts/gradle/EmbeddedApp/build.gradle
deleted file mode 100644
index 5cf5d3d..0000000
--- a/prebuilts/gradle/EmbeddedApp/build.gradle
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/EmbeddedApp/gradlew.bat b/prebuilts/gradle/EmbeddedApp/gradlew.bat
deleted file mode 100644
index 8a0b282..0000000
--- a/prebuilts/gradle/EmbeddedApp/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/prebuilts/gradle/EmbeddedApp/screenshots/embedded_wearable_app.png b/prebuilts/gradle/EmbeddedApp/screenshots/embedded_wearable_app.png
deleted file mode 100644
index 414afe5..0000000
--- a/prebuilts/gradle/EmbeddedApp/screenshots/embedded_wearable_app.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/screenshots/phone_app.png b/prebuilts/gradle/EmbeddedApp/screenshots/phone_app.png
deleted file mode 100644
index 46c3d89..0000000
--- a/prebuilts/gradle/EmbeddedApp/screenshots/phone_app.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/EmbeddedApp/settings.gradle b/prebuilts/gradle/EmbeddedApp/settings.gradle
deleted file mode 100644
index 19d00ac..0000000
--- a/prebuilts/gradle/EmbeddedApp/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':Application', ':Wearable'
diff --git a/prebuilts/gradle/FindMyPhone/Application/build.gradle b/prebuilts/gradle/FindMyPhone/Application/build.gradle
index 5a8cfd3..e8f9f0d 100644
--- a/prebuilts/gradle/FindMyPhone/Application/build.gradle
+++ b/prebuilts/gradle/FindMyPhone/Application/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
 
     dependencies {
@@ -10,10 +10,14 @@
 
 apply plugin: 'com.android.application'
 
+repositories {
+    jcenter()
+}
 
 dependencies {
-
-
+    compile "com.android.support:support-v4:21.0.2"
+    compile "com.android.support:support-v13:21.0.2"
+    compile "com.android.support:cardview-v7:21.0.2"
     compile 'com.google.android.gms:play-services-wearable:6.5.+'
     compile 'com.android.support:support-v13:21.0.+'
     wearApp project(':Wearable')
@@ -29,14 +33,11 @@
 
 android {
     compileSdkVersion 21
-
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
     }
 
     sourceSets {
diff --git a/prebuilts/gradle/FindMyPhone/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/FindMyPhone/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/FindMyPhone/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/FindMyPhone/README.md b/prebuilts/gradle/FindMyPhone/README.md
index 9726cf2..03c0eb2 100644
--- a/prebuilts/gradle/FindMyPhone/README.md
+++ b/prebuilts/gradle/FindMyPhone/README.md
@@ -10,7 +10,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Getting Started
diff --git a/prebuilts/gradle/FindMyPhone/Wearable/build.gradle b/prebuilts/gradle/FindMyPhone/Wearable/build.gradle
index a207d2c..2b9b845 100644
--- a/prebuilts/gradle/FindMyPhone/Wearable/build.gradle
+++ b/prebuilts/gradle/FindMyPhone/Wearable/build.gradle
@@ -31,7 +31,7 @@
 android {
     compileSdkVersion 21
 
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         versionCode 1
diff --git a/prebuilts/gradle/Flashlight/.google/packaging.yaml b/prebuilts/gradle/Flashlight/.google/packaging.yaml
index fd613ac..3c6e0de 100644
--- a/prebuilts/gradle/Flashlight/.google/packaging.yaml
+++ b/prebuilts/gradle/Flashlight/.google/packaging.yaml
@@ -9,4 +9,10 @@
 languages:    [Java]
 solutions:    [Mobile]
 github:       android-Flashlight
+level:        BEGINNER
+icon:         screenshots/icon-web.png
+apiRefs:
+    - android:android.app.Activity
+    - android:android.app.Fragment
+    - android:android.support.v4.view.ViewPager
 license: apache2
diff --git a/prebuilts/gradle/Flashlight/Application/build.gradle b/prebuilts/gradle/Flashlight/Application/build.gradle
deleted file mode 100644
index 5a8cfd3..0000000
--- a/prebuilts/gradle/Flashlight/Application/build.gradle
+++ /dev/null
@@ -1,69 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-
-dependencies {
-
-
-    compile 'com.google.android.gms:play-services-wearable:6.5.+'
-    compile 'com.android.support:support-v13:21.0.+'
-    wearApp project(':Wearable')
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
-    'main',     // main sample code; look here for the interesting stuff.
-    'common',   // components that are reused by multiple samples
-    'template'] // boilerplate code that is generated by the sample template process
-
-android {
-    compileSdkVersion 21
-
-    buildToolsVersion "21.1.1"
-
-    defaultConfig {
-        minSdkVersion 18
-        targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
-    }
-
-    sourceSets {
-        main {
-            dirs.each { dir ->
-                java.srcDirs "src/${dir}/java"
-                res.srcDirs "src/${dir}/res"
-            }
-        }
-        androidTest.setRoot('tests')
-        androidTest.java.srcDirs = ['tests/src']
-
-    }
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/Flashlight/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 925d11b..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2014 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.wearable.flashlight">
-
-    <uses-sdk android:minSdkVersion="18"
-              android:targetSdkVersion="21" />
-
-    <application android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name">
-    </application>
-
-</manifest>
-
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100755
index 589f229..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100755
index 77dd571..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100755
index fe34ebe..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100755
index ab80bcd..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/Flashlight/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout style="@style/Widget.SampleMessageTile"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
-
-        <TextView style="@style/Widget.SampleMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/horizontal_page_margin"
-            android:layout_marginRight="@dimen/horizontal_page_margin"
-            android:layout_marginTop="@dimen/vertical_page_margin"
-            android:layout_marginBottom="@dimen/vertical_page_margin"
-            android:text="@string/intro_message" />
-    </LinearLayout>
-</LinearLayout>
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/Flashlight/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/values-sw600dp/template-dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<resources>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_huge</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/Flashlight/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/values-sw600dp/template-styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<resources>
-
-    <style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceLarge</item>
-        <item name="android:lineSpacingMultiplier">1.2</item>
-        <item name="android:shadowDy">-6.5</item>
-    </style>
-
-</resources>
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/values-v21/base-colors.xml b/prebuilts/gradle/Flashlight/Application/src/main/res/values-v21/base-colors.xml
deleted file mode 100644
index 34c9cd1..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/values-v21/base-colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-<resources>
-
-
-</resources>
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/values-v21/base-template-styles.xml b/prebuilts/gradle/Flashlight/Application/src/main/res/values-v21/base-template-styles.xml
deleted file mode 100644
index 0b2948f..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/values-v21/base-template-styles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-<resources>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light">
-    </style>
-
-</resources>
diff --git a/prebuilts/gradle/Flashlight/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/Flashlight/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/Flashlight/Application/src/main/res/values/template-dimens.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<resources>
-
-    <!-- Define standard dimensions to comply with Holo-style grids and rhythm. -->
-
-    <dimen name="margin_tiny">4dp</dimen>
-    <dimen name="margin_small">8dp</dimen>
-    <dimen name="margin_medium">16dp</dimen>
-    <dimen name="margin_large">32dp</dimen>
-    <dimen name="margin_huge">64dp</dimen>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_medium</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/Flashlight/README.md b/prebuilts/gradle/Flashlight/README.md
index ef3af8b..ef2fc37 100644
--- a/prebuilts/gradle/Flashlight/README.md
+++ b/prebuilts/gradle/Flashlight/README.md
@@ -1,16 +1,31 @@
 Android Flashlight Sample
 ===================================
 
-Wearable activity that uses your wearable screen as a flashlight. There is also
-a party-mode option, if you want to make things interesting.
+Sample demonstrating the use of an Activity in a wearable application. The
+sample uses the screen as a flashlight.
+
+Introduction
+------------
+
+Sample demonstrating the use of an Activity in a wearable application. The
+sample also demonstrates using a ViewPager allowing the user to swipe between
+Fragments.
+
+Swipe left to reveal a multi colored flashlight, swipe right to return to the
+white flashlight.
 
 Pre-requisites
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
+Screenshots
+-------------
+
+<img src="screenshots/flashlight.png" height="400" alt="Screenshot"/> <img src="screenshots/party_mode.gif" height="400" alt="Screenshot"/> 
+
 Getting Started
 ---------------
 
diff --git a/prebuilts/gradle/Flashlight/Wearable/build.gradle b/prebuilts/gradle/Flashlight/Wearable/build.gradle
index a207d2c..2b9b845 100644
--- a/prebuilts/gradle/Flashlight/Wearable/build.gradle
+++ b/prebuilts/gradle/Flashlight/Wearable/build.gradle
@@ -31,7 +31,7 @@
 android {
     compileSdkVersion 21
 
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         versionCode 1
diff --git a/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-hdpi/ic_launcher.png
old mode 100755
new mode 100644
index 589f229..4f298cf
--- a/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-mdpi/ic_launcher.png
old mode 100755
new mode 100644
index 77dd571..17cff3c
--- a/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png
old mode 100755
new mode 100644
index fe34ebe..1663ae4
--- a/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-xxhdpi/ic_launcher.png
old mode 100755
new mode 100644
index ab80bcd..d3ea0c0
--- a/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/prebuilts/gradle/Flashlight/Wearable/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/prebuilts/gradle/Flashlight/screenshots/icon-web.png b/prebuilts/gradle/Flashlight/screenshots/icon-web.png
new file mode 100644
index 0000000..b8a7c14
--- /dev/null
+++ b/prebuilts/gradle/Flashlight/screenshots/icon-web.png
Binary files differ
diff --git a/prebuilts/gradle/Flashlight/settings.gradle b/prebuilts/gradle/Flashlight/settings.gradle
index 19d00ac..1d97d30 100644
--- a/prebuilts/gradle/Flashlight/settings.gradle
+++ b/prebuilts/gradle/Flashlight/settings.gradle
@@ -1 +1 @@
-include ':Application', ':Wearable'
+include ':Wearable'
diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/build.gradle b/prebuilts/gradle/FloatingActionButtonBasic/Application/build.gradle
index 71ddf50..fe4d074 100644
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/build.gradle
+++ b/prebuilts/gradle/FloatingActionButtonBasic/Application/build.gradle
@@ -14,13 +14,10 @@
     jcenter()
 }
 
-
 dependencies {
-
     compile "com.android.support:support-v4:21.0.2"
     compile "com.android.support:support-v13:21.0.2"
     compile "com.android.support:cardview-v7:21.0.2"
-
 }
 
 // The sample build uses multiple directories to
@@ -33,7 +30,7 @@
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.1"
+    buildToolsVersion "21.1.2"
 
     defaultConfig {
         minSdkVersion 21
diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java b/prebuilts/gradle/FloatingActionButtonBasic/Application/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java
index a900485..976e71c 100644
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java
+++ b/prebuilts/gradle/FloatingActionButtonBasic/Application/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java
@@ -17,16 +17,17 @@
 package com.example.android.floatingactionbuttonbasic.tests;
 
 import com.example.android.floatingactionbuttonbasic.*;
+import com.example.android.common.logger.LogFragment;
 
 import android.test.ActivityInstrumentationTestCase2;
 
 /**
-* Tests for FloatingActionButtonBasic sample.
+* Tests for FloatingActionButton sample.
 */
 public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
 
     private MainActivity mTestActivity;
-    private FloatingActionButton mTestFragment;
+    private LogFragment mTestFragment;
 
     public SampleTests() {
         super(MainActivity.class);
@@ -41,8 +42,8 @@
         // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK}
         // All other fields are null or empty.
         mTestActivity = getActivity();
-        mTestFragment = (FloatingActionButton)
-            mTestActivity.getSupportFragmentManager().getFragments().get(1);
+        mTestFragment = (LogFragment)
+            mTestActivity.getSupportFragmentManager().getFragments().get(0);
     }
 
     /**
@@ -59,4 +60,4 @@
     * Add more tests below.
     */
 
-}
\ No newline at end of file
+}
diff --git a/prebuilts/gradle/FloatingActionButtonBasic/README.md b/prebuilts/gradle/FloatingActionButtonBasic/README.md
index 02a7c92..fe60bf6 100644
--- a/prebuilts/gradle/FloatingActionButtonBasic/README.md
+++ b/prebuilts/gradle/FloatingActionButtonBasic/README.md
@@ -25,7 +25,7 @@
 --------------
 
 - Android SDK v21
-- Android Build Tools v21.1.1
+- Android Build Tools v21.1.2
 - Android Support Repository
 
 Screenshots
diff --git a/prebuilts/gradle/FragmentTransition/Application/build.gradle b/prebuilts/gradle/FragmentTransition/Application/build.gradle
deleted file mode 100644
index c6b8c26..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/build.gradle
+++ /dev/null
@@ -1,70 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-repositories {
-    jcenter()
-}
-
-
-dependencies {
-
-    compile "com.android.support:support-v4:21.0.2"
-    compile "com.android.support:support-v13:21.0.2"
-    compile "com.android.support:cardview-v7:21.0.2"
-
-}
-
-// The sample build uses multiple directories to
-// keep boilerplate and common code separate from
-// the main sample code.
-List<String> dirs = [
-    'main',     // main sample code; look here for the interesting stuff.
-    'common',   // components that are reused by multiple samples
-    'template'] // boilerplate code that is generated by the sample template process
-
-android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.1"
-
-    defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 21
-    }
-
-    sourceSets {
-        main {
-            dirs.each { dir ->
-                java.srcDirs "src/${dir}/java"
-                res.srcDirs "src/${dir}/res"
-            }
-        }
-        androidTest.setRoot('tests')
-        androidTest.java.srcDirs = ['tests/src']
-
-    }
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 2cfe406..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2014 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.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.fragmenttransition"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name="com.example.android.fragmenttransition.MainActivity"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
deleted file mode 100644
index 3228927..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-* Copyright 2013 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.example.android.common.activities;
-
-import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-
-import com.example.android.common.logger.Log;
-import com.example.android.common.logger.LogWrapper;
-
-/**
- * Base launcher activity, to handle most of the common plumbing for samples.
- */
-public class SampleActivityBase extends FragmentActivity {
-
-    public static final String TAG = "SampleActivityBase";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected  void onStart() {
-        super.onStart();
-        initializeLogging();
-    }
-
-    /** Set up targets to receive log data */
-    public void initializeLogging() {
-        // Using Log, front-end to the logging chain, emulates android.util.log method signatures.
-        // Wraps Android's native log framework
-        LogWrapper logWrapper = new LogWrapper();
-        Log.setLogNode(logWrapper);
-
-        Log.i(TAG, "Ready");
-    }
-}
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/Log.java
deleted file mode 100644
index 17503c5..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/Log.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (C) 2013 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.example.android.common.logger;
-
-/**
- * Helper class for a list (or tree) of LoggerNodes.
- *
- * <p>When this is set as the head of the list,
- * an instance of it can function as a drop-in replacement for {@link android.util.Log}.
- * Most of the methods in this class server only to map a method call in Log to its equivalent
- * in LogNode.</p>
- */
-public class Log {
-    // Grabbing the native values from Android's native logging facilities,
-    // to make for easy migration and interop.
-    public static final int NONE = -1;
-    public static final int VERBOSE = android.util.Log.VERBOSE;
-    public static final int DEBUG = android.util.Log.DEBUG;
-    public static final int INFO = android.util.Log.INFO;
-    public static final int WARN = android.util.Log.WARN;
-    public static final int ERROR = android.util.Log.ERROR;
-    public static final int ASSERT = android.util.Log.ASSERT;
-
-    // Stores the beginning of the LogNode topology.
-    private static LogNode mLogNode;
-
-    /**
-     * Returns the next LogNode in the linked list.
-     */
-    public static LogNode getLogNode() {
-        return mLogNode;
-    }
-
-    /**
-     * Sets the LogNode data will be sent to.
-     */
-    public static void setLogNode(LogNode node) {
-        mLogNode = node;
-    }
-
-    /**
-     * Instructs the LogNode to print the log data provided. Other LogNodes can
-     * be chained to the end of the LogNode as desired.
-     *
-     * @param priority Log level of the data being logged. Verbose, Error, etc.
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    public static void println(int priority, String tag, String msg, Throwable tr) {
-        if (mLogNode != null) {
-            mLogNode.println(priority, tag, msg, tr);
-        }
-    }
-
-    /**
-     * Instructs the LogNode to print the log data provided. Other LogNodes can
-     * be chained to the end of the LogNode as desired.
-     *
-     * @param priority Log level of the data being logged. Verbose, Error, etc.
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged. The actual message to be logged.
-     */
-    public static void println(int priority, String tag, String msg) {
-        println(priority, tag, msg, null);
-    }
-
-   /**
-     * Prints a message at VERBOSE priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    public static void v(String tag, String msg, Throwable tr) {
-        println(VERBOSE, tag, msg, tr);
-    }
-
-    /**
-     * Prints a message at VERBOSE priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     */
-    public static void v(String tag, String msg) {
-        v(tag, msg, null);
-    }
-
-
-    /**
-     * Prints a message at DEBUG priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    public static void d(String tag, String msg, Throwable tr) {
-        println(DEBUG, tag, msg, tr);
-    }
-
-    /**
-     * Prints a message at DEBUG priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     */
-    public static void d(String tag, String msg) {
-        d(tag, msg, null);
-    }
-
-    /**
-     * Prints a message at INFO priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    public static void i(String tag, String msg, Throwable tr) {
-        println(INFO, tag, msg, tr);
-    }
-
-    /**
-     * Prints a message at INFO priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     */
-    public static void i(String tag, String msg) {
-        i(tag, msg, null);
-    }
-
-    /**
-     * Prints a message at WARN priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    public static void w(String tag, String msg, Throwable tr) {
-        println(WARN, tag, msg, tr);
-    }
-
-    /**
-     * Prints a message at WARN priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     */
-    public static void w(String tag, String msg) {
-        w(tag, msg, null);
-    }
-
-    /**
-     * Prints a message at WARN priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    public static void w(String tag, Throwable tr) {
-        w(tag, null, tr);
-    }
-
-    /**
-     * Prints a message at ERROR priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    public static void e(String tag, String msg, Throwable tr) {
-        println(ERROR, tag, msg, tr);
-    }
-
-    /**
-     * Prints a message at ERROR priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     */
-    public static void e(String tag, String msg) {
-        e(tag, msg, null);
-    }
-
-    /**
-     * Prints a message at ASSERT priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    public static void wtf(String tag, String msg, Throwable tr) {
-        println(ASSERT, tag, msg, tr);
-    }
-
-    /**
-     * Prints a message at ASSERT priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param msg The actual message to be logged.
-     */
-    public static void wtf(String tag, String msg) {
-        wtf(tag, msg, null);
-    }
-
-    /**
-     * Prints a message at ASSERT priority.
-     *
-     * @param tag Tag for for the log data. Can be used to organize log statements.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    public static void wtf(String tag, Throwable tr) {
-        wtf(tag, null, tr);
-    }
-}
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
deleted file mode 100644
index b302acd..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-* Copyright 2013 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.
-*/
-/*
- * Copyright 2013 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.example.android.common.logger;
-
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ScrollView;
-
-/**
- * Simple fraggment which contains a LogView and uses is to output log data it receives
- * through the LogNode interface.
- */
-public class LogFragment extends Fragment {
-
-    private LogView mLogView;
-    private ScrollView mScrollView;
-
-    public LogFragment() {}
-
-    public View inflateViews() {
-        mScrollView = new ScrollView(getActivity());
-        ViewGroup.LayoutParams scrollParams = new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT);
-        mScrollView.setLayoutParams(scrollParams);
-
-        mLogView = new LogView(getActivity());
-        ViewGroup.LayoutParams logParams = new ViewGroup.LayoutParams(scrollParams);
-        logParams.height = ViewGroup.LayoutParams.WRAP_CONTENT;
-        mLogView.setLayoutParams(logParams);
-        mLogView.setClickable(true);
-        mLogView.setFocusable(true);
-        mLogView.setTypeface(Typeface.MONOSPACE);
-
-        // Want to set padding as 16 dips, setPadding takes pixels.  Hooray math!
-        int paddingDips = 16;
-        double scale = getResources().getDisplayMetrics().density;
-        int paddingPixels = (int) ((paddingDips * (scale)) + .5);
-        mLogView.setPadding(paddingPixels, paddingPixels, paddingPixels, paddingPixels);
-        mLogView.setCompoundDrawablePadding(paddingPixels);
-
-        mLogView.setGravity(Gravity.BOTTOM);
-        mLogView.setTextAppearance(getActivity(), android.R.style.TextAppearance_Holo_Medium);
-
-        mScrollView.addView(mLogView);
-        return mScrollView;
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-
-        View result = inflateViews();
-
-        mLogView.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {}
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                mScrollView.fullScroll(ScrollView.FOCUS_DOWN);
-            }
-        });
-        return result;
-    }
-
-    public LogView getLogView() {
-        return mLogView;
-    }
-}
\ No newline at end of file
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
deleted file mode 100644
index bc37cab..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2012 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.example.android.common.logger;
-
-/**
- * Basic interface for a logging system that can output to one or more targets.
- * Note that in addition to classes that will output these logs in some format,
- * one can also implement this interface over a filter and insert that in the chain,
- * such that no targets further down see certain data, or see manipulated forms of the data.
- * You could, for instance, write a "ToHtmlLoggerNode" that just converted all the log data
- * it received to HTML and sent it along to the next node in the chain, without printing it
- * anywhere.
- */
-public interface LogNode {
-
-    /**
-     * Instructs first LogNode in the list to print the log data provided.
-     * @param priority Log level of the data being logged.  Verbose, Error, etc.
-     * @param tag Tag for for the log data.  Can be used to organize log statements.
-     * @param msg The actual message to be logged. The actual message to be logged.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    public void println(int priority, String tag, String msg, Throwable tr);
-
-}
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
deleted file mode 100644
index c01542b..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2013 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.example.android.common.logger;
-
-import android.app.Activity;
-import android.content.Context;
-import android.util.*;
-import android.widget.TextView;
-
-/** Simple TextView which is used to output log data received through the LogNode interface.
-*/
-public class LogView extends TextView implements LogNode {
-
-    public LogView(Context context) {
-        super(context);
-    }
-
-    public LogView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public LogView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    /**
-     * Formats the log data and prints it out to the LogView.
-     * @param priority Log level of the data being logged.  Verbose, Error, etc.
-     * @param tag Tag for for the log data.  Can be used to organize log statements.
-     * @param msg The actual message to be logged. The actual message to be logged.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    @Override
-    public void println(int priority, String tag, String msg, Throwable tr) {
-
-        
-        String priorityStr = null;
-
-        // For the purposes of this View, we want to print the priority as readable text.
-        switch(priority) {
-            case android.util.Log.VERBOSE:
-                priorityStr = "VERBOSE";
-                break;
-            case android.util.Log.DEBUG:
-                priorityStr = "DEBUG";
-                break;
-            case android.util.Log.INFO:
-                priorityStr = "INFO";
-                break;
-            case android.util.Log.WARN:
-                priorityStr = "WARN";
-                break;
-            case android.util.Log.ERROR:
-                priorityStr = "ERROR";
-                break;
-            case android.util.Log.ASSERT:
-                priorityStr = "ASSERT";
-                break;
-            default:
-                break;
-        }
-
-        // Handily, the Log class has a facility for converting a stack trace into a usable string.
-        String exceptionStr = null;
-        if (tr != null) {
-            exceptionStr = android.util.Log.getStackTraceString(tr);
-        }
-
-        // Take the priority, tag, message, and exception, and concatenate as necessary
-        // into one usable line of text.
-        final StringBuilder outputBuilder = new StringBuilder();
-
-        String delimiter = "\t";
-        appendIfNotNull(outputBuilder, priorityStr, delimiter);
-        appendIfNotNull(outputBuilder, tag, delimiter);
-        appendIfNotNull(outputBuilder, msg, delimiter);
-        appendIfNotNull(outputBuilder, exceptionStr, delimiter);
-
-        // In case this was originally called from an AsyncTask or some other off-UI thread,
-        // make sure the update occurs within the UI thread.
-        ((Activity) getContext()).runOnUiThread( (new Thread(new Runnable() {
-            @Override
-            public void run() {
-                // Display the text we just generated within the LogView.
-                appendToLog(outputBuilder.toString());
-            }
-        })));
-
-        if (mNext != null) {
-            mNext.println(priority, tag, msg, tr);
-        }
-    }
-
-    public LogNode getNext() {
-        return mNext;
-    }
-
-    public void setNext(LogNode node) {
-        mNext = node;
-    }
-
-    /** Takes a string and adds to it, with a separator, if the bit to be added isn't null. Since
-     * the logger takes so many arguments that might be null, this method helps cut out some of the
-     * agonizing tedium of writing the same 3 lines over and over.
-     * @param source StringBuilder containing the text to append to.
-     * @param addStr The String to append
-     * @param delimiter The String to separate the source and appended strings. A tab or comma,
-     *                  for instance.
-     * @return The fully concatenated String as a StringBuilder
-     */
-    private StringBuilder appendIfNotNull(StringBuilder source, String addStr, String delimiter) {
-        if (addStr != null) {
-            if (addStr.length() == 0) {
-                delimiter = "";
-            }
-
-            return source.append(addStr).append(delimiter);
-        }
-        return source;
-    }
-
-    // The next LogNode in the chain.
-    LogNode mNext;
-
-    /** Outputs the string as a new line of log data in the LogView. */
-    public void appendToLog(String s) {
-        append("\n" + s);
-    }
-
-
-}
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
deleted file mode 100644
index 16a9e7b..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2012 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.example.android.common.logger;
-
-import android.util.Log;
-
-/**
- * Helper class which wraps Android's native Log utility in the Logger interface.  This way
- * normal DDMS output can be one of the many targets receiving and outputting logs simultaneously.
- */
-public class LogWrapper implements LogNode {
-
-    // For piping:  The next node to receive Log data after this one has done its work.
-    private LogNode mNext;
-
-    /**
-     * Returns the next LogNode in the linked list.
-     */
-    public LogNode getNext() {
-        return mNext;
-    }
-
-    /**
-     * Sets the LogNode data will be sent to..
-     */
-    public void setNext(LogNode node) {
-        mNext = node;
-    }
-
-    /**
-     * Prints data out to the console using Android's native log mechanism.
-     * @param priority Log level of the data being logged.  Verbose, Error, etc.
-     * @param tag Tag for for the log data.  Can be used to organize log statements.
-     * @param msg The actual message to be logged. The actual message to be logged.
-     * @param tr If an exception was thrown, this can be sent along for the logging facilities
-     *           to extract and print useful information.
-     */
-    @Override
-    public void println(int priority, String tag, String msg, Throwable tr) {
-        // There actually are log methods that don't take a msg parameter.  For now,
-        // if that's the case, just convert null to the empty string and move on.
-        String useMsg = msg;
-        if (useMsg == null) {
-            useMsg = "";
-        }
-
-        // If an exeption was provided, convert that exception to a usable string and attach
-        // it to the end of the msg method.
-        if (tr != null) {
-            msg += "\n" + Log.getStackTraceString(tr);
-        }
-
-        // This is functionally identical to Log.x(tag, useMsg);
-        // For instance, if priority were Log.VERBOSE, this would be the same as Log.v(tag, useMsg)
-        Log.println(priority, tag, useMsg);
-
-        // If this isn't the last node in the chain, move things along.
-        if (mNext != null) {
-            mNext.println(priority, tag, msg, tr);
-        }
-    }
-}
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
deleted file mode 100644
index 19967dc..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2013 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.example.android.common.logger;
-
-/**
- * Simple {@link LogNode} filter, removes everything except the message.
- * Useful for situations like on-screen log output where you don't want a lot of metadata displayed,
- * just easy-to-read message updates as they're happening.
- */
-public class MessageOnlyLogFilter implements LogNode {
-
-    LogNode mNext;
-
-    /**
-     * Takes the "next" LogNode as a parameter, to simplify chaining.
-     *
-     * @param next The next LogNode in the pipeline.
-     */
-    public MessageOnlyLogFilter(LogNode next) {
-        mNext = next;
-    }
-
-    public MessageOnlyLogFilter() {
-    }
-
-    @Override
-    public void println(int priority, String tag, String msg, Throwable tr) {
-        if (mNext != null) {
-            getNext().println(Log.NONE, null, msg, null);
-        }
-    }
-
-    /**
-     * Returns the next LogNode in the chain.
-     */
-    public LogNode getNext() {
-        return mNext;
-    }
-
-    /**
-     * Sets the LogNode data will be sent to..
-     */
-    public void setNext(LogNode node) {
-        mNext = node;
-    }
-
-}
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
deleted file mode 100644
index 20049e3..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (C) 2013 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.example.android.common.view;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.HorizontalScrollView;
-import android.widget.TextView;
-
-/**
- * To be used with ViewPager to provide a tab indicator component which give constant feedback as to
- * the user's scroll progress.
- * <p>
- * To use the component, simply add it to your view hierarchy. Then in your
- * {@link android.app.Activity} or {@link android.support.v4.app.Fragment} call
- * {@link #setViewPager(ViewPager)} providing it the ViewPager this layout is being used for.
- * <p>
- * The colors can be customized in two ways. The first and simplest is to provide an array of colors
- * via {@link #setSelectedIndicatorColors(int...)} and {@link #setDividerColors(int...)}. The
- * alternative is via the {@link TabColorizer} interface which provides you complete control over
- * which color is used for any individual position.
- * <p>
- * The views used as tabs can be customized by calling {@link #setCustomTabView(int, int)},
- * providing the layout ID of your custom layout.
- */
-public class SlidingTabLayout extends HorizontalScrollView {
-
-    /**
-     * Allows complete control over the colors drawn in the tab layout. Set with
-     * {@link #setCustomTabColorizer(TabColorizer)}.
-     */
-    public interface TabColorizer {
-
-        /**
-         * @return return the color of the indicator used when {@code position} is selected.
-         */
-        int getIndicatorColor(int position);
-
-        /**
-         * @return return the color of the divider drawn to the right of {@code position}.
-         */
-        int getDividerColor(int position);
-
-    }
-
-    private static final int TITLE_OFFSET_DIPS = 24;
-    private static final int TAB_VIEW_PADDING_DIPS = 16;
-    private static final int TAB_VIEW_TEXT_SIZE_SP = 12;
-
-    private int mTitleOffset;
-
-    private int mTabViewLayoutId;
-    private int mTabViewTextViewId;
-
-    private ViewPager mViewPager;
-    private ViewPager.OnPageChangeListener mViewPagerPageChangeListener;
-
-    private final SlidingTabStrip mTabStrip;
-
-    public SlidingTabLayout(Context context) {
-        this(context, null);
-    }
-
-    public SlidingTabLayout(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SlidingTabLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-
-        // Disable the Scroll Bar
-        setHorizontalScrollBarEnabled(false);
-        // Make sure that the Tab Strips fills this View
-        setFillViewport(true);
-
-        mTitleOffset = (int) (TITLE_OFFSET_DIPS * getResources().getDisplayMetrics().density);
-
-        mTabStrip = new SlidingTabStrip(context);
-        addView(mTabStrip, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-    }
-
-    /**
-     * Set the custom {@link TabColorizer} to be used.
-     *
-     * If you only require simple custmisation then you can use
-     * {@link #setSelectedIndicatorColors(int...)} and {@link #setDividerColors(int...)} to achieve
-     * similar effects.
-     */
-    public void setCustomTabColorizer(TabColorizer tabColorizer) {
-        mTabStrip.setCustomTabColorizer(tabColorizer);
-    }
-
-    /**
-     * Sets the colors to be used for indicating the selected tab. These colors are treated as a
-     * circular array. Providing one color will mean that all tabs are indicated with the same color.
-     */
-    public void setSelectedIndicatorColors(int... colors) {
-        mTabStrip.setSelectedIndicatorColors(colors);
-    }
-
-    /**
-     * Sets the colors to be used for tab dividers. These colors are treated as a circular array.
-     * Providing one color will mean that all tabs are indicated with the same color.
-     */
-    public void setDividerColors(int... colors) {
-        mTabStrip.setDividerColors(colors);
-    }
-
-    /**
-     * Set the {@link ViewPager.OnPageChangeListener}. When using {@link SlidingTabLayout} you are
-     * required to set any {@link ViewPager.OnPageChangeListener} through this method. This is so
-     * that the layout can update it's scroll position correctly.
-     *
-     * @see ViewPager#setOnPageChangeListener(ViewPager.OnPageChangeListener)
-     */
-    public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) {
-        mViewPagerPageChangeListener = listener;
-    }
-
-    /**
-     * Set the custom layout to be inflated for the tab views.
-     *
-     * @param layoutResId Layout id to be inflated
-     * @param textViewId id of the {@link TextView} in the inflated view
-     */
-    public void setCustomTabView(int layoutResId, int textViewId) {
-        mTabViewLayoutId = layoutResId;
-        mTabViewTextViewId = textViewId;
-    }
-
-    /**
-     * Sets the associated view pager. Note that the assumption here is that the pager content
-     * (number of tabs and tab titles) does not change after this call has been made.
-     */
-    public void setViewPager(ViewPager viewPager) {
-        mTabStrip.removeAllViews();
-
-        mViewPager = viewPager;
-        if (viewPager != null) {
-            viewPager.setOnPageChangeListener(new InternalViewPagerListener());
-            populateTabStrip();
-        }
-    }
-
-    /**
-     * Create a default view to be used for tabs. This is called if a custom tab view is not set via
-     * {@link #setCustomTabView(int, int)}.
-     */
-    protected TextView createDefaultTabView(Context context) {
-        TextView textView = new TextView(context);
-        textView.setGravity(Gravity.CENTER);
-        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, TAB_VIEW_TEXT_SIZE_SP);
-        textView.setTypeface(Typeface.DEFAULT_BOLD);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            // If we're running on Honeycomb or newer, then we can use the Theme's
-            // selectableItemBackground to ensure that the View has a pressed state
-            TypedValue outValue = new TypedValue();
-            getContext().getTheme().resolveAttribute(android.R.attr.selectableItemBackground,
-                    outValue, true);
-            textView.setBackgroundResource(outValue.resourceId);
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            // If we're running on ICS or newer, enable all-caps to match the Action Bar tab style
-            textView.setAllCaps(true);
-        }
-
-        int padding = (int) (TAB_VIEW_PADDING_DIPS * getResources().getDisplayMetrics().density);
-        textView.setPadding(padding, padding, padding, padding);
-
-        return textView;
-    }
-
-    private void populateTabStrip() {
-        final PagerAdapter adapter = mViewPager.getAdapter();
-        final View.OnClickListener tabClickListener = new TabClickListener();
-
-        for (int i = 0; i < adapter.getCount(); i++) {
-            View tabView = null;
-            TextView tabTitleView = null;
-
-            if (mTabViewLayoutId != 0) {
-                // If there is a custom tab view layout id set, try and inflate it
-                tabView = LayoutInflater.from(getContext()).inflate(mTabViewLayoutId, mTabStrip,
-                        false);
-                tabTitleView = (TextView) tabView.findViewById(mTabViewTextViewId);
-            }
-
-            if (tabView == null) {
-                tabView = createDefaultTabView(getContext());
-            }
-
-            if (tabTitleView == null && TextView.class.isInstance(tabView)) {
-                tabTitleView = (TextView) tabView;
-            }
-
-            tabTitleView.setText(adapter.getPageTitle(i));
-            tabView.setOnClickListener(tabClickListener);
-
-            mTabStrip.addView(tabView);
-        }
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-
-        if (mViewPager != null) {
-            scrollToTab(mViewPager.getCurrentItem(), 0);
-        }
-    }
-
-    private void scrollToTab(int tabIndex, int positionOffset) {
-        final int tabStripChildCount = mTabStrip.getChildCount();
-        if (tabStripChildCount == 0 || tabIndex < 0 || tabIndex >= tabStripChildCount) {
-            return;
-        }
-
-        View selectedChild = mTabStrip.getChildAt(tabIndex);
-        if (selectedChild != null) {
-            int targetScrollX = selectedChild.getLeft() + positionOffset;
-
-            if (tabIndex > 0 || positionOffset > 0) {
-                // If we're not at the first child and are mid-scroll, make sure we obey the offset
-                targetScrollX -= mTitleOffset;
-            }
-
-            scrollTo(targetScrollX, 0);
-        }
-    }
-
-    private class InternalViewPagerListener implements ViewPager.OnPageChangeListener {
-        private int mScrollState;
-
-        @Override
-        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-            int tabStripChildCount = mTabStrip.getChildCount();
-            if ((tabStripChildCount == 0) || (position < 0) || (position >= tabStripChildCount)) {
-                return;
-            }
-
-            mTabStrip.onViewPagerPageChanged(position, positionOffset);
-
-            View selectedTitle = mTabStrip.getChildAt(position);
-            int extraOffset = (selectedTitle != null)
-                    ? (int) (positionOffset * selectedTitle.getWidth())
-                    : 0;
-            scrollToTab(position, extraOffset);
-
-            if (mViewPagerPageChangeListener != null) {
-                mViewPagerPageChangeListener.onPageScrolled(position, positionOffset,
-                        positionOffsetPixels);
-            }
-        }
-
-        @Override
-        public void onPageScrollStateChanged(int state) {
-            mScrollState = state;
-
-            if (mViewPagerPageChangeListener != null) {
-                mViewPagerPageChangeListener.onPageScrollStateChanged(state);
-            }
-        }
-
-        @Override
-        public void onPageSelected(int position) {
-            if (mScrollState == ViewPager.SCROLL_STATE_IDLE) {
-                mTabStrip.onViewPagerPageChanged(position, 0f);
-                scrollToTab(position, 0);
-            }
-
-            if (mViewPagerPageChangeListener != null) {
-                mViewPagerPageChangeListener.onPageSelected(position);
-            }
-        }
-
-    }
-
-    private class TabClickListener implements View.OnClickListener {
-        @Override
-        public void onClick(View v) {
-            for (int i = 0; i < mTabStrip.getChildCount(); i++) {
-                if (v == mTabStrip.getChildAt(i)) {
-                    mViewPager.setCurrentItem(i);
-                    return;
-                }
-            }
-        }
-    }
-
-}
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
deleted file mode 100644
index d5bbbae..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2013 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.example.android.common.view;
-
-import android.R;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.LinearLayout;
-
-class SlidingTabStrip extends LinearLayout {
-
-    private static final int DEFAULT_BOTTOM_BORDER_THICKNESS_DIPS = 2;
-    private static final byte DEFAULT_BOTTOM_BORDER_COLOR_ALPHA = 0x26;
-    private static final int SELECTED_INDICATOR_THICKNESS_DIPS = 8;
-    private static final int DEFAULT_SELECTED_INDICATOR_COLOR = 0xFF33B5E5;
-
-    private static final int DEFAULT_DIVIDER_THICKNESS_DIPS = 1;
-    private static final byte DEFAULT_DIVIDER_COLOR_ALPHA = 0x20;
-    private static final float DEFAULT_DIVIDER_HEIGHT = 0.5f;
-
-    private final int mBottomBorderThickness;
-    private final Paint mBottomBorderPaint;
-
-    private final int mSelectedIndicatorThickness;
-    private final Paint mSelectedIndicatorPaint;
-
-    private final int mDefaultBottomBorderColor;
-
-    private final Paint mDividerPaint;
-    private final float mDividerHeight;
-
-    private int mSelectedPosition;
-    private float mSelectionOffset;
-
-    private SlidingTabLayout.TabColorizer mCustomTabColorizer;
-    private final SimpleTabColorizer mDefaultTabColorizer;
-
-    SlidingTabStrip(Context context) {
-        this(context, null);
-    }
-
-    SlidingTabStrip(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setWillNotDraw(false);
-
-        final float density = getResources().getDisplayMetrics().density;
-
-        TypedValue outValue = new TypedValue();
-        context.getTheme().resolveAttribute(R.attr.colorForeground, outValue, true);
-        final int themeForegroundColor =  outValue.data;
-
-        mDefaultBottomBorderColor = setColorAlpha(themeForegroundColor,
-                DEFAULT_BOTTOM_BORDER_COLOR_ALPHA);
-
-        mDefaultTabColorizer = new SimpleTabColorizer();
-        mDefaultTabColorizer.setIndicatorColors(DEFAULT_SELECTED_INDICATOR_COLOR);
-        mDefaultTabColorizer.setDividerColors(setColorAlpha(themeForegroundColor,
-                DEFAULT_DIVIDER_COLOR_ALPHA));
-
-        mBottomBorderThickness = (int) (DEFAULT_BOTTOM_BORDER_THICKNESS_DIPS * density);
-        mBottomBorderPaint = new Paint();
-        mBottomBorderPaint.setColor(mDefaultBottomBorderColor);
-
-        mSelectedIndicatorThickness = (int) (SELECTED_INDICATOR_THICKNESS_DIPS * density);
-        mSelectedIndicatorPaint = new Paint();
-
-        mDividerHeight = DEFAULT_DIVIDER_HEIGHT;
-        mDividerPaint = new Paint();
-        mDividerPaint.setStrokeWidth((int) (DEFAULT_DIVIDER_THICKNESS_DIPS * density));
-    }
-
-    void setCustomTabColorizer(SlidingTabLayout.TabColorizer customTabColorizer) {
-        mCustomTabColorizer = customTabColorizer;
-        invalidate();
-    }
-
-    void setSelectedIndicatorColors(int... colors) {
-        // Make sure that the custom colorizer is removed
-        mCustomTabColorizer = null;
-        mDefaultTabColorizer.setIndicatorColors(colors);
-        invalidate();
-    }
-
-    void setDividerColors(int... colors) {
-        // Make sure that the custom colorizer is removed
-        mCustomTabColorizer = null;
-        mDefaultTabColorizer.setDividerColors(colors);
-        invalidate();
-    }
-
-    void onViewPagerPageChanged(int position, float positionOffset) {
-        mSelectedPosition = position;
-        mSelectionOffset = positionOffset;
-        invalidate();
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        final int height = getHeight();
-        final int childCount = getChildCount();
-        final int dividerHeightPx = (int) (Math.min(Math.max(0f, mDividerHeight), 1f) * height);
-        final SlidingTabLayout.TabColorizer tabColorizer = mCustomTabColorizer != null
-                ? mCustomTabColorizer
-                : mDefaultTabColorizer;
-
-        // Thick colored underline below the current selection
-        if (childCount > 0) {
-            View selectedTitle = getChildAt(mSelectedPosition);
-            int left = selectedTitle.getLeft();
-            int right = selectedTitle.getRight();
-            int color = tabColorizer.getIndicatorColor(mSelectedPosition);
-
-            if (mSelectionOffset > 0f && mSelectedPosition < (getChildCount() - 1)) {
-                int nextColor = tabColorizer.getIndicatorColor(mSelectedPosition + 1);
-                if (color != nextColor) {
-                    color = blendColors(nextColor, color, mSelectionOffset);
-                }
-
-                // Draw the selection partway between the tabs
-                View nextTitle = getChildAt(mSelectedPosition + 1);
-                left = (int) (mSelectionOffset * nextTitle.getLeft() +
-                        (1.0f - mSelectionOffset) * left);
-                right = (int) (mSelectionOffset * nextTitle.getRight() +
-                        (1.0f - mSelectionOffset) * right);
-            }
-
-            mSelectedIndicatorPaint.setColor(color);
-
-            canvas.drawRect(left, height - mSelectedIndicatorThickness, right,
-                    height, mSelectedIndicatorPaint);
-        }
-
-        // Thin underline along the entire bottom edge
-        canvas.drawRect(0, height - mBottomBorderThickness, getWidth(), height, mBottomBorderPaint);
-
-        // Vertical separators between the titles
-        int separatorTop = (height - dividerHeightPx) / 2;
-        for (int i = 0; i < childCount - 1; i++) {
-            View child = getChildAt(i);
-            mDividerPaint.setColor(tabColorizer.getDividerColor(i));
-            canvas.drawLine(child.getRight(), separatorTop, child.getRight(),
-                    separatorTop + dividerHeightPx, mDividerPaint);
-        }
-    }
-
-    /**
-     * Set the alpha value of the {@code color} to be the given {@code alpha} value.
-     */
-    private static int setColorAlpha(int color, byte alpha) {
-        return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color));
-    }
-
-    /**
-     * Blend {@code color1} and {@code color2} using the given ratio.
-     *
-     * @param ratio of which to blend. 1.0 will return {@code color1}, 0.5 will give an even blend,
-     *              0.0 will return {@code color2}.
-     */
-    private static int blendColors(int color1, int color2, float ratio) {
-        final float inverseRation = 1f - ratio;
-        float r = (Color.red(color1) * ratio) + (Color.red(color2) * inverseRation);
-        float g = (Color.green(color1) * ratio) + (Color.green(color2) * inverseRation);
-        float b = (Color.blue(color1) * ratio) + (Color.blue(color2) * inverseRation);
-        return Color.rgb((int) r, (int) g, (int) b);
-    }
-
-    private static class SimpleTabColorizer implements SlidingTabLayout.TabColorizer {
-        private int[] mIndicatorColors;
-        private int[] mDividerColors;
-
-        @Override
-        public final int getIndicatorColor(int position) {
-            return mIndicatorColors[position % mIndicatorColors.length];
-        }
-
-        @Override
-        public final int getDividerColor(int position) {
-            return mDividerColors[position % mDividerColors.length];
-        }
-
-        void setIndicatorColors(int... colors) {
-            mIndicatorColors = colors;
-        }
-
-        void setDividerColors(int... colors) {
-            mDividerColors = colors;
-        }
-    }
-}
\ No newline at end of file
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/DetailFragment.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/DetailFragment.java
deleted file mode 100644
index 81e7b46..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/DetailFragment.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright 2014 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.example.android.fragmenttransition;
-
-import com.example.android.common.logger.Log;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.transition.Scene;
-import android.transition.TransitionManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-public class DetailFragment extends Fragment implements Animation.AnimationListener {
-
-    private static final String TAG = "DetailFragment";
-
-    private static final String ARG_RESOURCE_ID = "resource_id";
-    private static final String ARG_TITLE = "title";
-    private static final String ARG_X = "x";
-    private static final String ARG_Y = "y";
-    private static final String ARG_WIDTH = "width";
-    private static final String ARG_HEIGHT = "height";
-
-    /**
-     * Create a new instance of DetailFragment.
-     *
-     * @param resourceId The resource ID of the Drawable image to show
-     * @param title The title of the image
-     * @param x The horizontal position of the grid item in pixel
-     * @param y The vertical position of the grid item in pixel
-     * @param width The width of the grid item in pixel
-     * @param height The height of the grid item in pixel
-     * @return a new instance of DetailFragment
-     */
-    public static DetailFragment newInstance(int resourceId, String title,
-                                             int x, int y, int width, int height) {
-        DetailFragment fragment = new DetailFragment();
-        Bundle args = new Bundle();
-        args.putInt(ARG_RESOURCE_ID, resourceId);
-        args.putString(ARG_TITLE, title);
-        args.putInt(ARG_X, x);
-        args.putInt(ARG_Y, y);
-        args.putInt(ARG_WIDTH, width);
-        args.putInt(ARG_HEIGHT, height);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    public DetailFragment() {
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_detail, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        FrameLayout root = (FrameLayout) view;
-        Context context = view.getContext();
-        assert context != null;
-        // This is how the fragment looks at first. Since the transition is one-way, we don't need to make
-        // this a Scene.
-        View item = LayoutInflater.from(context).inflate(R.layout.item_meat_grid, root, false);
-        assert item != null;
-        bind(item);
-        // We adjust the position of the initial image with LayoutParams using the values supplied
-        // as the fragment arguments.
-        Bundle args = getArguments();
-        FrameLayout.LayoutParams params = null;
-        if (args != null) {
-            params = new FrameLayout.LayoutParams(
-                    args.getInt(ARG_WIDTH), args.getInt(ARG_HEIGHT));
-            params.topMargin = args.getInt(ARG_Y);
-            params.leftMargin = args.getInt(ARG_X);
-        }
-        root.addView(item, params);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    /**
-     * Bind the views inside of parent with the fragment arguments.
-     *
-     * @param parent The parent of views to bind.
-     */
-    private void bind(View parent) {
-        Bundle args = getArguments();
-        if (args == null) {
-            return;
-        }
-        ImageView image = (ImageView) parent.findViewById(R.id.image);
-        image.setImageResource(args.getInt(ARG_RESOURCE_ID));
-        TextView title = (TextView) parent.findViewById(R.id.title);
-        title.setText(args.getString(ARG_TITLE));
-    }
-
-    @Override
-    public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
-        Animation animation = AnimationUtils.loadAnimation(getActivity(),
-                enter ? android.R.anim.fade_in : android.R.anim.fade_out);
-        // We bind a listener for the fragment transaction. We only bind it when
-        // this fragment is entering.
-        if (animation != null && enter) {
-            animation.setAnimationListener(this);
-        }
-        return animation;
-    }
-
-    @Override
-    public void onAnimationStart(Animation animation) {
-        // This method is called at the end of the animation for the fragment transaction.
-        // There is nothing we need to do in this sample.
-    }
-
-    @Override
-    public void onAnimationEnd(Animation animation) {
-        // This method is called at the end of the animation for the fragment transaction,
-        // which is perfect time to start our Transition.
-        Log.i(TAG, "Fragment animation ended. Starting a Transition.");
-        final Scene scene = Scene.getSceneForLayout((ViewGroup) getView(),
-                R.layout.fragment_detail_content, getActivity());
-        TransitionManager.go(scene);
-        // Note that we need to bind views with data after we call TransitionManager.go().
-        bind(scene.getSceneRoot());
-    }
-
-    @Override
-    public void onAnimationRepeat(Animation animation) {
-        // This method is never called in this sample because the animation doesn't repeat.
-    }
-
-}
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java
deleted file mode 100644
index c072eb9..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2014 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.example.android.fragmenttransition;
-
-import com.example.android.common.logger.Log;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.AdapterView;
-import android.widget.GridView;
-
-public class FragmentTransitionFragment extends Fragment implements AdapterView.OnItemClickListener {
-
-    private static final String TAG = "FragmentTransitionFragment";
-
-    private MeatAdapter mAdapter;
-
-    public static FragmentTransitionFragment newInstance() {
-        return new FragmentTransitionFragment();
-    }
-
-    public FragmentTransitionFragment() {
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // This is the adapter we use to populate the grid.
-        mAdapter = new MeatAdapter(inflater, R.layout.item_meat_grid);
-        // Inflate the layout with a GridView in it.
-        return inflater.inflate(R.layout.fragment_fragment_transition, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        GridView grid = (GridView) view.findViewById(R.id.grid);
-        grid.setAdapter(mAdapter);
-        grid.setOnItemClickListener(this);
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        Meat meat = mAdapter.getItem(position);
-        Log.i(TAG, meat.title + " clicked. Replacing fragment.");
-        // We start the fragment transaction here. It is just an ordinary fragment transaction.
-        getActivity().getSupportFragmentManager()
-                .beginTransaction()
-                .replace(R.id.sample_content_fragment,
-                        DetailFragment.newInstance(meat.resourceId, meat.title,
-                                (int) view.getX(), (int) view.getY(),
-                                view.getWidth(), view.getHeight())
-                )
-                // We push the fragment transaction to back stack. User can go back to the
-                // previous fragment by pressing back button.
-                .addToBackStack("detail")
-                .commit();
-    }
-
-    @Override
-    public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
-        return AnimationUtils.loadAnimation(getActivity(),
-                enter ? android.R.anim.fade_in : android.R.anim.fade_out);
-    }
-
-}
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/Meat.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/Meat.java
deleted file mode 100644
index 2f2fdfa..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/Meat.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2014 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.example.android.fragmenttransition;
-
-/**
- * This represents a sample data.
- */
-public class Meat {
-
-    public int resourceId;
-    public String title;
-
-    public Meat(int resourceId, String title) {
-        this.resourceId = resourceId;
-        this.title = title;
-    }
-
-    public static final Meat[] MEATS = {
-            new Meat(R.drawable.p1, "First"),
-            new Meat(R.drawable.p2, "Second"),
-            new Meat(R.drawable.p3, "Third"),
-            new Meat(R.drawable.p4, "Fourth"),
-            new Meat(R.drawable.p5, "Fifth"),
-            new Meat(R.drawable.p6, "Sixth"),
-            new Meat(R.drawable.p7, "Seventh"),
-            new Meat(R.drawable.p8, "Eighth"),
-            new Meat(R.drawable.p9, "Ninth"),
-            new Meat(R.drawable.p10, "Tenth"),
-            new Meat(R.drawable.p11, "Eleventh"),
-    };
-
-}
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java
deleted file mode 100644
index 307fd85..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2014 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.example.android.fragmenttransition;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-class MeatAdapter extends BaseAdapter {
-
-    private final LayoutInflater mLayoutInflater;
-    private final int mResourceId;
-
-    public MeatAdapter(LayoutInflater inflater, int resourceId) {
-        mLayoutInflater = inflater;
-        mResourceId = resourceId;
-    }
-
-    @Override
-    public int getCount() {
-        return Meat.MEATS.length;
-    }
-
-    @Override
-    public Meat getItem(int position) {
-        return Meat.MEATS[position];
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return Meat.MEATS[position].resourceId;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        final View view;
-        final ViewHolder holder;
-        if (null == convertView) {
-            view = mLayoutInflater.inflate(mResourceId, parent, false);
-            holder = new ViewHolder();
-            assert view != null;
-            holder.image = (ImageView) view.findViewById(R.id.image);
-            holder.title = (TextView) view.findViewById(R.id.title);
-            view.setTag(holder);
-        } else {
-            view = convertView;
-            holder = (ViewHolder) view.getTag();
-        }
-        bindView(holder, position);
-        return view;
-    }
-
-    public void bindView(ViewHolder holder, int position) {
-        Meat meat = getItem(position);
-        holder.image.setImageResource(meat.resourceId);
-        holder.title.setText(meat.title);
-    }
-
-    public static class ViewHolder {
-        public ImageView image;
-        public TextView title;
-    }
-
-}
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index dfa1b45..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 5f4ae7b..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p1.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p1.jpg
deleted file mode 100644
index 10f07ac..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p1.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p10.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p10.jpg
deleted file mode 100644
index 4272f4c..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p10.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p11.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p11.jpg
deleted file mode 100644
index c5722b2..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p11.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p2.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p2.jpg
deleted file mode 100644
index ca380ae..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p2.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p3.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p3.jpg
deleted file mode 100644
index 6fc71e7..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p3.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p4.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p4.jpg
deleted file mode 100644
index 153c1ff..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p4.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p5.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p5.jpg
deleted file mode 100644
index 46d6a13..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p5.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p6.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p6.jpg
deleted file mode 100644
index 89ccb83..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p6.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p7.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p7.jpg
deleted file mode 100644
index 7e9546d..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p7.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p8.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p8.jpg
deleted file mode 100644
index 21e25ba..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p8.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p9.jpg b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p9.jpg
deleted file mode 100644
index 79854cb..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p9.jpg
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 5e00f33..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index e061498..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout-w720dp/activity_main.xml
deleted file mode 100755
index c9a52f6..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout-w720dp/activity_main.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-<LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      android:orientation="horizontal"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:id="@+id/sample_main_layout">
-
-    <LinearLayout
-          android:id="@+id/sample_output"
-          android:layout_width="0px"
-          android:layout_height="match_parent"
-          android:layout_weight="1"
-          android:orientation="vertical">
-
-        <FrameLayout
-              style="@style/Widget.SampleMessageTile"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content">
-
-            <TextView
-                  style="@style/Widget.SampleMessage"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:paddingLeft="@dimen/margin_medium"
-                  android:paddingRight="@dimen/margin_medium"
-                  android:paddingTop="@dimen/margin_large"
-                  android:paddingBottom="@dimen/margin_large"
-                  android:text="@string/intro_message" />
-        </FrameLayout>
-
-        <View
-              android:layout_width="match_parent"
-              android:layout_height="1dp"
-              android:background="@android:color/darker_gray" />
-
-        <fragment
-              android:name="com.example.android.common.logger.LogFragment"
-              android:id="@+id/log_fragment"
-              android:layout_width="match_parent"
-              android:layout_height="0px"
-              android:layout_weight="1" />
-
-    </LinearLayout>
-
-    <View
-          android:layout_width="1dp"
-          android:layout_height="match_parent"
-          android:background="@android:color/darker_gray" />
-
-    <FrameLayout
-          android:id="@+id/sample_content_fragment"
-          android:layout_weight="2"
-          android:layout_width="0px"
-          android:layout_height="match_parent" />
-
-</LinearLayout>
-
-
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index 1ae4f98..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-<LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      android:orientation="vertical"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:id="@+id/sample_main_layout">
-
-    <ViewAnimator
-          android:id="@+id/sample_output"
-          android:layout_width="match_parent"
-          android:layout_height="0px"
-          android:layout_weight="1">
-
-        <ScrollView
-              style="@style/Widget.SampleMessageTile"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-            <TextView
-                  style="@style/Widget.SampleMessage"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:paddingLeft="@dimen/horizontal_page_margin"
-                  android:paddingRight="@dimen/horizontal_page_margin"
-                  android:paddingTop="@dimen/vertical_page_margin"
-                  android:paddingBottom="@dimen/vertical_page_margin"
-                  android:text="@string/intro_message" />
-        </ScrollView>
-
-        <fragment
-              android:name="com.example.android.common.logger.LogFragment"
-              android:id="@+id/log_fragment"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent" />
-
-    </ViewAnimator>
-
-    <View
-          android:layout_width="match_parent"
-          android:layout_height="1dp"
-          android:background="@android:color/darker_gray" />
-
-    <FrameLayout
-          android:id="@+id/sample_content_fragment"
-          android:layout_weight="2"
-          android:layout_width="match_parent"
-          android:layout_height="0px" />
-
-</LinearLayout>
-
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_detail_content.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_detail_content.xml
deleted file mode 100644
index 2068460..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_detail_content.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-<ScrollView
-    android:id="@+id/frame"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbars="none">
-
-    <RelativeLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="match_parent"
-            android:layout_height="180dp"
-            android:scaleType="centerCrop"
-            tools:src="@drawable/p1"/>
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/image"
-            android:layout_alignEnd="@id/image"
-            android:layout_marginEnd="16dp"
-            android:shadowColor="#000000"
-            android:shadowDx="0"
-            android:shadowDy="0"
-            android:shadowRadius="10"
-            android:textColor="#ffffff"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            tools:text="Image"/>
-
-        <TextView
-            android:id="@+id/body"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/image"
-            android:layout_marginBottom="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/lorem_ipsum"/>
-
-    </RelativeLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_fragment_transition.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_fragment_transition.xml
deleted file mode 100644
index 6e1c7a1..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_fragment_transition.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-<GridView
-    android:id="@+id/grid"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:columnWidth="150dp"
-    android:horizontalSpacing="1dp"
-    android:numColumns="auto_fit"
-    android:padding="1dp"
-    android:scrollbars="none"
-    android:stretchMode="columnWidth"
-    android:verticalSpacing="1dp"
-    tools:context="com.example.android.fragmenttransition.FragmentTransitionFragment"/>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/item_meat_grid.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/item_meat_grid.xml
deleted file mode 100644
index df34883..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/item_meat_grid.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2014 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.
--->
-<FrameLayout
-    android:id="@+id/frame"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <RelativeLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="150dp"
-        tools:ignore="UselessParent">
-
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:src="@drawable/p1"/>
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_gravity="bottom|end"
-            android:layout_marginEnd="16dp"
-            android:layout_marginStart="16dp"
-            android:gravity="center_horizontal"
-            android:shadowColor="#000000"
-            android:shadowDx="0"
-            android:shadowDy="0"
-            android:shadowRadius="10"
-            android:textColor="#ffffff"
-            android:textSize="24sp"
-            android:textStyle="bold"
-            tools:text="Hello"/>
-
-    </RelativeLayout>
-
-</FrameLayout>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/menu/main.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/menu/main.xml
deleted file mode 100644
index b49c2c5..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_toggle_log"
-          android:showAsAction="always"
-          android:title="@string/sample_show_log" />
-</menu>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<resources>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_huge</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<resources>
-
-    <style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceLarge</item>
-        <item name="android:lineSpacingMultiplier">1.2</item>
-        <item name="android:shadowDy">-6.5</item>
-    </style>
-
-</resources>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v11/template-styles.xml
deleted file mode 100644
index 8c1ea66..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v11/template-styles.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<resources>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Holo.Light" />
-
-</resources>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v21/base-colors.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v21/base-colors.xml
deleted file mode 100644
index 34c9cd1..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v21/base-colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-<resources>
-
-
-</resources>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v21/base-template-styles.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v21/base-template-styles.xml
deleted file mode 100644
index 0b2948f..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v21/base-template-styles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-<resources>
-
-    <!-- Activity themes -->
-    <style name="Theme.Base" parent="android:Theme.Material.Light">
-    </style>
-
-</resources>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 92707c9..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/base-strings.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2013 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.
--->
-<resources>
-    <string name="app_name">FragmentTransition</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-	    This sample demonstrates how to start a transition right after a fragment transaction.
-            
-        
-        ]]>
-    </string>
-</resources>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/fragmentview_strings.xml
deleted file mode 100755
index 7b9d9ec..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/fragmentview_strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-  Copyright 2013 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.
--->
-<resources>
-    <string name="sample_show_log">Show Log</string>
-    <string name="sample_hide_log">Hide Log</string>
-</resources>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/strings.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/strings.xml
deleted file mode 100644
index 5f77789..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2014 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.
--->
-<resources>
-
-    <string name="lorem_ipsum">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</string>
-
-</resources>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-dimens.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<resources>
-
-    <!-- Define standard dimensions to comply with Holo-style grids and rhythm. -->
-
-    <dimen name="margin_tiny">4dp</dimen>
-    <dimen name="margin_small">8dp</dimen>
-    <dimen name="margin_medium">16dp</dimen>
-    <dimen name="margin_large">32dp</dimen>
-    <dimen name="margin_huge">64dp</dimen>
-
-    <!-- Semantic definitions -->
-
-    <dimen name="horizontal_page_margin">@dimen/margin_medium</dimen>
-    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
-
-</resources>
diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 6e7d593..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-styles.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-  Copyright 2013 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.
-  -->
-
-<resources>
-
-    <!-- Activity themes -->
-
-    <style name="Theme.Base" parent="android:Theme.Light" />
-
-    <style name="Theme.Sample" parent="Theme.Base" />
-
-    <style name="AppTheme" parent="Theme.Sample" />
-    <!-- Widget styling -->
-
-    <style name="Widget" />
-
-    <style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceMedium</item>
-        <item name="android:lineSpacingMultiplier">1.1</item>
-    </style>
-
-    <style name="Widget.SampleMessageTile">
-        <item name="android:background">@drawable/tile</item>
-        <item name="android:shadowColor">#7F000000</item>
-        <item name="android:shadowDy">-3.5</item>
-        <item name="android:shadowRadius">2</item>
-    </style>
-
-</resources>
diff --git a/prebuilts/gradle/FragmentTransition/CONTRIB.md b/prebuilts/gradle/FragmentTransition/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/FragmentTransition/CONTRIB.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# How to become a contributor and submit your own code
-
-## Contributor License Agreements
-
-We'd love to accept your sample apps and patches! Before we can take them, we
-have to jump a couple of legal hurdles.
-
-Please fill out either the individual or corporate Contributor License Agreement (CLA).
-
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an [individual CLA]
-    (https://developers.google.com/open-source/cla/individual).
-  * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a [corporate CLA]
-    (https://developers.google.com/open-source/cla/corporate).
-
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able to
-accept your pull requests.
-
-## Contributing A Patch
-
-1. Submit an issue describing your proposed change to the repo in question.
-1. The repo owner will respond to your issue promptly.
-1. If your proposed change is accepted, and you haven't already done so, sign a
-   Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
-1. Ensure that your code adheres to the existing style in the sample to which
-   you are contributing. Refer to the
-   [Android Code Style Guide]
-   (https://source.android.com/source/code-style.html) for the
-   recommended coding standards for this organization.
-1. Ensure that your code has an appropriate set of unit tests which all pass.
-1. Submit a pull request.
-
diff --git a/prebuilts/gradle/FragmentTransition/CONTRIBUTING.md b/prebuilts/gradle/FragmentTransition/CONTRIBUTING.md
deleted file mode 100644
index faa8b5c..0000000
--- a/prebuilts/gradle/FragmentTransition/CONTRIBUTING.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# How to become a contributor and submit your own code
-
-## Contributor License Agreements
-
-We'd love to accept your sample apps and patches! Before we can take them, we
-have to jump a couple of legal hurdles.
-
-Please fill out either the individual or corporate Contributor License Agreement (CLA).
-
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an [individual CLA]
-    (https://cla.developers.google.com).
-  * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a [corporate CLA]
-    (https://cla.developers.google.com).
-
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able to
-accept your pull requests.
-
-## Contributing A Patch
-
-1. Submit an issue describing your proposed change to the repo in question.
-1. The repo owner will respond to your issue promptly.
-1. If your proposed change is accepted, and you haven't already done so, sign a
-   Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
-1. Ensure that your code adheres to the existing style in the sample to which
-   you are contributing. Refer to the
-   [Android Code Style Guide]
-   (https://source.android.com/source/code-style.html) for the
-   recommended coding standards for this organization.
-1. Ensure that your code has an appropriate set of unit tests which all pass.
-1. Submit a pull request.
-
diff --git a/prebuilts/gradle/FragmentTransition/LICENSE b/prebuilts/gradle/FragmentTransition/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/FragmentTransition/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2014 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.
diff --git a/prebuilts/gradle/FragmentTransition/NOTICE b/prebuilts/gradle/FragmentTransition/NOTICE
deleted file mode 100644
index e37ec1a..0000000
--- a/prebuilts/gradle/FragmentTransition/NOTICE
+++ /dev/null
@@ -1,15 +0,0 @@
-This sample uses the following software:
-
-Copyright 2015 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.
diff --git a/prebuilts/gradle/FragmentTransition/README.md b/prebuilts/gradle/FragmentTransition/README.md
deleted file mode 100644
index 44f12ed..0000000
--- a/prebuilts/gradle/FragmentTransition/README.md
+++ /dev/null
@@ -1,74 +0,0 @@
-Android FragmentTransition Sample
-===================================
-
-This sample demonstrates how to start a Transition after a Fragment Transaction.
-
-Introduction
-------------