Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / developers / build / 4d23db8e4c86e3185ae3d56f72d3711eb7107409^2..4d23db8e4c86e3185ae3d56f72d3711eb7107409 / .
commit4d23db8e4c86e3185ae3d56f72d3711eb7107409[log] [tgz]
authorTrevor Johns <trevorjohns@google.com>Tue Dec 09 00:19:46 2014 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>Tue Dec 09 00:19:46 2014 +0000
treedcdbc8cbdfc7e1ab0253b907e0f9cf063d18e237
parent9a32c1118530a07fc5a1a56eae69c8f43228c2a9 [diff]
parent0318c47ffc955fe26db3e12c1bb67f179cac417b [diff]
am 0318c47f: am e3aa98eb: am eb0742f1: Merge "Remove README/packaging.yaml from create template" into lmp-docs

* commit '0318c47ffc955fe26db3e12c1bb67f179cac417b':
  Remove README/packaging.yaml from create template

diff --git a/prebuilts/androidtv/leanback/.gitignore b/prebuilts/androidtv/leanback/.gitignore
deleted file mode 100644
index fa29e9c..0000000
--- a/prebuilts/androidtv/leanback/.gitignore
+++ /dev/null

@@ -1,33 +0,0 @@
-
-#built application files
-*.apk
-*.ap_
-
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
-
-# generated files
-bin/
-gen/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Windows thumbnail db
-Thumbs.db
-
-# OSX files
-.DS_Store
-
-# Eclipse project files
-.classpath
-.project
-
-# Android Studio
-.idea
-#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
-.gradle
-build/

diff --git a/prebuilts/androidtv/leanback/AndroidManifest.xml b/prebuilts/androidtv/leanback/AndroidManifest.xml
new file mode 100644
index 0000000..e3bf401
--- /dev/null
+++ b/prebuilts/androidtv/leanback/AndroidManifest.xml

@@ -0,0 +1,82 @@
+<?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.leanback"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="19"
+        android:targetSdkVersion="19" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
+    <application
+        android:allowBackup="false"
+        android:icon="@drawable/videos_by_google_banner"
+        android:label="@string/app_name"
+        android:logo="@drawable/videos_by_google_banner"
+        android:theme="@style/Theme.Leanback" >
+        <activity
+            android:name="MainActivity"
+            android:icon="@drawable/videos_by_google_banner"
+            android:label="@string/app_name"
+            android:logo="@drawable/videos_by_google_banner"
+            android:screenOrientation="landscape" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="DetailsActivity"
+            android:exported="true" />
+        <activity
+            android:name="PlayerActivity"
+            android:exported="true"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
+        <activity
+            android:name="VerticalGridActivity"
+            android:exported="true"
+            android:parentActivityName="MainActivity" />
+        <activity
+            android:name="SearchActivity"
+            android:exported="true" />
+
+        <receiver
+            android:name=".BootupActivity"
+            android:enabled="true"
+            android:exported="false" >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name=".UpdateRecommendationsService"
+            android:enabled="true" />
+    </application>
+
+</manifest>

diff --git a/prebuilts/androidtv/leanback/README.md b/prebuilts/androidtv/leanback/README.md
index 458ad02..320e4f2 100644
--- a/prebuilts/androidtv/leanback/README.md
+++ b/prebuilts/androidtv/leanback/README.md

@@ -1,4 +1,4 @@
-# AndroidTV Leanback Support Library sample for videos
+# VisualGameController
 
 The Leanback API Demo/Video By Googles app is designed to run on an Android TV device and demonstrates how to use the Leanback Support library
 in order to comply with the UX guidelines of Android TV.
@@ -12,7 +12,7 @@
 * Compile and deploy to your Android TV device.
 
 ## References and How to report bugs
-* [Android TV Developer Documentation](http://developer.android.com/tv)
+* [Developer Documentation](http://developers.google.com/)
 
 ## How to make contributions?
 Please read and follow the steps in the CONTRIBUTING.md
@@ -21,5 +21,6 @@
 See LICENSE
 
 ## Google+
-Android TV Community Page on Google+ [https://g.co/androidtvdev](https://g.co/androidtvdev)
+Google Developers Page on Google+ [https://plus.google.com/+GoogleDevelopers/posts](https://plus.google.com/+GoogleDevelopers/posts)
+
 ## Change List

diff --git a/prebuilts/androidtv/leanback/app/build.gradle b/prebuilts/androidtv/leanback/app/build.gradle
deleted file mode 100644
index d3bcdb4..0000000
--- a/prebuilts/androidtv/leanback/app/build.gradle
+++ /dev/null

@@ -1,28 +0,0 @@
-apply plugin: 'android'
-
-android {
-    compileSdkVersion 20
-    buildToolsVersion "20"
-
-    defaultConfig {
-        applicationId "com.example.android.leanback"
-        minSdkVersion 20
-        targetSdkVersion 20
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile "com.android.support:leanback-v17:21.0.+"
-    compile "com.android.support:recyclerview-v7:21.0.+"
-    compile 'com.android.support:support-v4:13.0.+'
-    compile 'com.squareup.picasso:picasso:2.3.3'
-}

diff --git a/prebuilts/androidtv/leanback/app/proguard-rules.pro b/prebuilts/androidtv/leanback/app/proguard-rules.pro
deleted file mode 100644
index c9384b0..0000000
--- a/prebuilts/androidtv/leanback/app/proguard-rules.pro
+++ /dev/null

@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /usr/local/google/home/cartland/android-sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}

diff --git a/prebuilts/androidtv/leanback/app/src/main/AndroidManifest.xml b/prebuilts/androidtv/leanback/app/src/main/AndroidManifest.xml
deleted file mode 100644
index 65b02b5..0000000
--- a/prebuilts/androidtv/leanback/app/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,85 +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.leanback"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="19"
-        android:targetSdkVersion="19" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
-
-    <uses-feature android:name="android.software.leanback"
-        android:required="true" />
-
-    <application
-        android:allowBackup="false"
-        android:icon="@drawable/videos_by_google_banner"
-        android:label="@string/app_name"
-        android:logo="@drawable/videos_by_google_banner"
-        android:theme="@style/Theme.Leanback" >
-        <activity
-            android:name="MainActivity"
-            android:icon="@drawable/videos_by_google_banner"
-            android:label="@string/app_name"
-            android:logo="@drawable/videos_by_google_banner"
-            android:screenOrientation="landscape" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="DetailsActivity"
-            android:exported="true" />
-        <activity
-            android:name="PlayerActivity"
-            android:exported="true"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
-        <activity
-            android:name="VerticalGridActivity"
-            android:exported="true"
-            android:parentActivityName="MainActivity" />
-        <activity
-            android:name="SearchActivity"
-            android:exported="true" />
-
-        <receiver
-            android:name=".BootupActivity"
-            android:enabled="true"
-            android:exported="false" >
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name=".UpdateRecommendationsService"
-            android:enabled="true" />
-    </application>
-
-</manifest>

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/LeanbackDetailsFragment.java b/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/LeanbackDetailsFragment.java
deleted file mode 100644
index 1bdc175..0000000
--- a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/LeanbackDetailsFragment.java
+++ /dev/null

@@ -1,193 +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.leanback;
-
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.support.v17.leanback.app.BackgroundManager;
-import android.support.v17.leanback.app.DetailsFragment;
-import android.support.v17.leanback.widget.Action;
-import android.support.v17.leanback.widget.ArrayObjectAdapter;
-import android.support.v17.leanback.widget.ClassPresenterSelector;
-import android.support.v17.leanback.widget.DetailsOverviewRow;
-import android.support.v17.leanback.widget.DetailsOverviewRowPresenter;
-import android.support.v17.leanback.widget.HeaderItem;
-import android.support.v17.leanback.widget.ListRow;
-import android.support.v17.leanback.widget.ListRowPresenter;
-import android.support.v17.leanback.widget.OnActionClickedListener;
-import android.support.v17.leanback.widget.OnItemClickedListener;
-import android.support.v17.leanback.widget.Row;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.widget.Toast;
-
-import com.squareup.picasso.Picasso;
-import com.squareup.picasso.Target;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/*
- * LeanbackDetailsFragment extends DetailsFragment, a Wrapper fragment for leanback details screens.
- * It shows a detailed view of video and its meta plus related videos.
- */
-public class LeanbackDetailsFragment extends DetailsFragment {
-    private static final String TAG = "DetailsFragment";
-
-    private static final int ACTION_WATCH_TRAILER = 1;
-    private static final int ACTION_RENT = 2;
-    private static final int ACTION_BUY = 3;
-
-    private static final int DETAIL_THUMB_WIDTH = 274;
-    private static final int DETAIL_THUMB_HEIGHT = 274;
-
-    private Movie selectedMovie;
-
-    private Drawable mDefaultBackground;
-    private Target mBackgroundTarget;
-    private DisplayMetrics mMetrics;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        Log.i(TAG, "onCreate DetailsFragment");
-        super.onCreate(savedInstanceState);
-
-        BackgroundManager backgroundManager = BackgroundManager.getInstance(getActivity());
-        backgroundManager.attach(getActivity().getWindow());
-        mBackgroundTarget = new PicassoBackgroundManagerTarget(backgroundManager);
-
-        mDefaultBackground = getResources().getDrawable(R.drawable.default_background);
-
-        mMetrics = new DisplayMetrics();
-        getActivity().getWindowManager().getDefaultDisplay().getMetrics(mMetrics);
-
-        selectedMovie = (Movie) getActivity().getIntent().getSerializableExtra("Movie");
-        Log.d(TAG, "DetailsActivity movie: " + selectedMovie.toString());
-        new DetailRowBuilderTask().execute(selectedMovie);
-
-        setOnItemClickedListener(getDefaultItemClickedListener());
-        updateBackground(selectedMovie.getBackgroundImageURI());
-    }
-
-    private class DetailRowBuilderTask extends AsyncTask<Movie, Integer, DetailsOverviewRow> {
-        @Override
-        protected DetailsOverviewRow doInBackground(Movie... movies) {
-            selectedMovie = movies[0];
-
-            Log.d(TAG, "doInBackground: " + selectedMovie.toString());
-            DetailsOverviewRow row = new DetailsOverviewRow(selectedMovie);
-            try {
-                Bitmap poster = Picasso.with(getActivity())
-                        .load(selectedMovie.getCardImageUrl())
-                        .resize(Utils.dpToPx(DETAIL_THUMB_WIDTH, getActivity()
-                                .getApplicationContext()),
-                                Utils.dpToPx(DETAIL_THUMB_HEIGHT, getActivity()
-                                        .getApplicationContext()))
-                        .centerCrop()
-                        .get();
-                row.setImageBitmap(getActivity(), poster);
-            } catch (IOException e) {
-            }
-
-            row.addAction(new Action(ACTION_WATCH_TRAILER, getResources().getString(
-                    R.string.watch_trailer_1), getResources().getString(R.string.watch_trailer_2)));
-            row.addAction(new Action(ACTION_RENT, getResources().getString(R.string.rent_1),
-                    getResources().getString(R.string.rent_2)));
-            row.addAction(new Action(ACTION_BUY, getResources().getString(R.string.buy_1),
-                    getResources().getString(R.string.buy_2)));
-            return row;
-        }
-
-        @Override
-        protected void onPostExecute(DetailsOverviewRow detailRow) {
-            ClassPresenterSelector ps = new ClassPresenterSelector();
-            DetailsOverviewRowPresenter dorPresenter =
-                    new DetailsOverviewRowPresenter(new DetailsDescriptionPresenter());
-            // set detail background and style
-            dorPresenter.setBackgroundColor(getResources().getColor(R.color.detail_background));
-            dorPresenter.setStyleLarge(true);
-            dorPresenter.setOnActionClickedListener(new OnActionClickedListener() {
-                @Override
-                public void onActionClicked(Action action) {
-                    if (action.getId() == ACTION_WATCH_TRAILER) {
-                        Intent intent = new Intent(getActivity(), PlayerActivity.class);
-                        intent.putExtra(getResources().getString(R.string.movie), selectedMovie);
-                        intent.putExtra(getResources().getString(R.string.should_start), true);
-                        startActivity(intent);
-                    }
-                    else {
-                        Toast.makeText(getActivity(), action.toString(), Toast.LENGTH_SHORT).show();
-                    }
-                }
-            });
-
-            ps.addClassPresenter(DetailsOverviewRow.class, dorPresenter);
-            ps.addClassPresenter(ListRow.class,
-                    new ListRowPresenter());
-
-            ArrayObjectAdapter adapter = new ArrayObjectAdapter(ps);
-            adapter.add(detailRow);
-
-            String subcategories[] = {
-                    getString(R.string.related_movies)
-            };
-            HashMap<String, List<Movie>> movies = VideoProvider.getMovieList();
-
-            ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(new CardPresenter());
-            for (Map.Entry<String, List<Movie>> entry : movies.entrySet())
-            {
-                if (selectedMovie.getCategory().indexOf(entry.getKey()) >= 0) {
-                    List<Movie> list = entry.getValue();
-                    for (int j = 0; j < list.size(); j++) {
-                        listRowAdapter.add(list.get(j));
-                    }
-                }
-            }
-            HeaderItem header = new HeaderItem(0, subcategories[0], null);
-            adapter.add(new ListRow(header, listRowAdapter));
-
-            setAdapter(adapter);
-        }
-
-    }
-
-    protected OnItemClickedListener getDefaultItemClickedListener() {
-        return new OnItemClickedListener() {
-            @Override
-            public void onItemClicked(Object item, Row row) {
-                if (item instanceof Movie) {
-                    Movie movie = (Movie) item;
-                    Intent intent = new Intent(getActivity(), DetailsActivity.class);
-                    intent.putExtra(getResources().getString(R.string.movie), movie);
-                    startActivity(intent);
-                }
-            }
-        };
-    }
-
-    protected void updateBackground(URI uri) {
-        Picasso.with(getActivity())
-                .load(uri.toString())
-                .resize(mMetrics.widthPixels, mMetrics.heightPixels)
-                .error(mDefaultBackground)
-                .into(mBackgroundTarget);
-    }
-}

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/MainFragment.java b/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/MainFragment.java
deleted file mode 100644
index 7d6ff11..0000000
--- a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/MainFragment.java
+++ /dev/null

@@ -1,291 +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.leanback;
-
-import android.app.LoaderManager;
-import android.content.Intent;
-import android.content.Loader;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v17.leanback.app.BackgroundManager;
-import android.support.v17.leanback.app.BrowseFragment;
-import android.support.v17.leanback.widget.ArrayObjectAdapter;
-import android.support.v17.leanback.widget.HeaderItem;
-import android.support.v17.leanback.widget.ListRow;
-import android.support.v17.leanback.widget.ListRowPresenter;
-import android.support.v17.leanback.widget.OnItemClickedListener;
-import android.support.v17.leanback.widget.OnItemSelectedListener;
-import android.support.v17.leanback.widget.Presenter;
-import android.support.v17.leanback.widget.Row;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.squareup.picasso.Picasso;
-import com.squareup.picasso.Target;
-
-import java.net.URI;
-import java.util.*;
-
-/*
- * Main class to show BrowseFragment with header and rows of videos
- */
-public class MainFragment extends BrowseFragment implements
-        LoaderManager.LoaderCallbacks<HashMap<String, List<Movie>>> {
-    private static final String TAG = "MainFragment";
-
-    private static int BACKGROUND_UPDATE_DELAY = 300;
-    private static int GRID_ITEM_WIDTH = 200;
-    private static int GRID_ITEM_HEIGHT = 200;
-
-    private ArrayObjectAdapter mRowsAdapter;
-    private Drawable mDefaultBackground;
-    private Target mBackgroundTarget;
-    private DisplayMetrics mMetrics;
-    private Timer mBackgroundTimer;
-    private final Handler mHandler = new Handler();
-    private URI mBackgroundURI;
-    private static String mVideosUrl;
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        Log.i(TAG, "onCreate");
-        super.onActivityCreated(savedInstanceState);
-
-        loadVideoData();
-
-        prepareBackgroundManager();
-        setupUIElements();
-        setupEventListeners();
-    }
-
-    private void prepareBackgroundManager() {
-        BackgroundManager backgroundManager = BackgroundManager.getInstance(getActivity());
-        backgroundManager.attach(getActivity().getWindow());
-        mBackgroundTarget = new PicassoBackgroundManagerTarget(backgroundManager);
-        mDefaultBackground = getResources().getDrawable(R.drawable.default_background);
-        mMetrics = new DisplayMetrics();
-        getActivity().getWindowManager().getDefaultDisplay().getMetrics(mMetrics);
-    }
-
-    private void setupUIElements() {
-        // setBadgeDrawable(getActivity().getResources().getDrawable(R.drawable.videos_by_google_banner));
-        setTitle(getString(R.string.browse_title)); // Badge, when set, takes precedent over title
-        setHeadersState(HEADERS_ENABLED);
-        setHeadersTransitionOnBackEnabled(true);
-        // set fastLane (or headers) background color
-        setBrandColor(getResources().getColor(R.color.fastlane_background));
-        // set search icon color
-        setSearchAffordanceColor(getResources().getColor(R.color.search_opaque));
-    }
-
-    private void loadVideoData() {
-        VideoProvider.setContext(getActivity());
-        mVideosUrl = getActivity().getResources().getString(R.string.catalog_url);
-        getLoaderManager().initLoader(0, null, this);
-    }
-
-    private void setupEventListeners() {
-        setOnSearchClickedListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(getActivity(), SearchActivity.class);
-                startActivity(intent);
-            }
-        });
-
-        setOnItemSelectedListener(getDefaultItemSelectedListener());
-        setOnItemClickedListener(getDefaultItemClickedListener());
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.support.v4.app.LoaderManager.LoaderCallbacks#onCreateLoader(int,
-     * android.os.Bundle)
-     */
-    @Override
-    public Loader<HashMap<String, List<Movie>>> onCreateLoader(int arg0, Bundle arg1) {
-        Log.d(TAG, "VideoItemLoader created ");
-        return new VideoItemLoader(getActivity(), mVideosUrl);
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see android.support.v4.app.LoaderManager.LoaderCallbacks#onLoadFinished(android
-     * .support.v4.content.Loader, java.lang.Object)
-     */
-    @Override
-    public void onLoadFinished(Loader<HashMap<String, List<Movie>>> arg0,
-            HashMap<String, List<Movie>> data) {
-
-        mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
-        CardPresenter cardPresenter = new CardPresenter();
-
-        int i = 0;
-
-        for (Map.Entry<String, List<Movie>> entry : data.entrySet())
-        {
-            ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(cardPresenter);
-            List<Movie> list = entry.getValue();
-
-            for (int j = 0; j < list.size(); j++) {
-                listRowAdapter.add(list.get(j));
-            }
-            HeaderItem header = new HeaderItem(i, entry.getKey(), null);
-            i++;
-            mRowsAdapter.add(new ListRow(header, listRowAdapter));
-        }
-
-        HeaderItem gridHeader = new HeaderItem(i, getResources().getString(R.string.preferences),
-                null);
-
-        GridItemPresenter gridPresenter = new GridItemPresenter();
-        ArrayObjectAdapter gridRowAdapter = new ArrayObjectAdapter(gridPresenter);
-        gridRowAdapter.add(getResources().getString(R.string.grid_view));
-        gridRowAdapter.add(getResources().getString(R.string.send_feeback));
-        gridRowAdapter.add(getResources().getString(R.string.personal_settings));
-        mRowsAdapter.add(new ListRow(gridHeader, gridRowAdapter));
-
-        setAdapter(mRowsAdapter);
-
-        updateRecommendations();
-    }
-
-    @Override
-    public void onLoaderReset(Loader<HashMap<String, List<Movie>>> arg0) {
-        mRowsAdapter.clear();
-    }
-
-    protected OnItemSelectedListener getDefaultItemSelectedListener() {
-        return new OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(Object item, Row row) {
-                if (item instanceof Movie) {
-                    mBackgroundURI = ((Movie) item).getBackgroundImageURI();
-                    startBackgroundTimer();
-                }
-            }
-        };
-    }
-
-    protected OnItemClickedListener getDefaultItemClickedListener() {
-        return new OnItemClickedListener() {
-            @Override
-            public void onItemClicked(Object item, Row row) {
-                if (item instanceof Movie) {
-                    Movie movie = (Movie) item;
-                    Log.d(TAG, "Item: " + item.toString());
-                    Intent intent = new Intent(getActivity(), DetailsActivity.class);
-                    intent.putExtra(getString(R.string.movie), movie);
-                    startActivity(intent);
-                }
-                else if (item instanceof String) {
-                    if (((String) item).indexOf(getResources().getString(R.string.grid_view)) >= 0) {
-                        Intent intent = new Intent(getActivity(), VerticalGridActivity.class);
-                        startActivity(intent);
-                    }
-                    else {
-                        Toast.makeText(getActivity(), ((String) item), Toast.LENGTH_SHORT)
-                                .show();
-                    }
-                }
-
-            }
-        };
-    }
-
-    protected void setDefaultBackground(Drawable background) {
-        mDefaultBackground = background;
-    }
-
-    protected void setDefaultBackground(int resourceId) {
-        mDefaultBackground = getResources().getDrawable(resourceId);
-    }
-
-    protected void updateBackground(URI uri) {
-        Picasso.with(getActivity())
-                .load(uri.toString())
-                .resize(mMetrics.widthPixels, mMetrics.heightPixels)
-                .centerCrop()
-                .error(mDefaultBackground)
-                .into(mBackgroundTarget);
-    }
-
-    protected void updateBackground(Drawable drawable) {
-        BackgroundManager.getInstance(getActivity()).setDrawable(drawable);
-    }
-
-    protected void clearBackground() {
-        BackgroundManager.getInstance(getActivity()).setDrawable(mDefaultBackground);
-    }
-
-    private void startBackgroundTimer() {
-        if (null != mBackgroundTimer) {
-            mBackgroundTimer.cancel();
-        }
-        mBackgroundTimer = new Timer();
-        mBackgroundTimer.schedule(new UpdateBackgroundTask(), BACKGROUND_UPDATE_DELAY);
-    }
-
-    private class UpdateBackgroundTask extends TimerTask {
-
-        @Override
-        public void run() {
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    if (mBackgroundURI != null) {
-                        updateBackground(mBackgroundURI);
-                    }
-                }
-            });
-        }
-    }
-
-    private class GridItemPresenter extends Presenter {
-        @Override
-        public ViewHolder onCreateViewHolder(ViewGroup parent) {
-            TextView view = new TextView(parent.getContext());
-            view.setLayoutParams(new ViewGroup.LayoutParams(GRID_ITEM_WIDTH, GRID_ITEM_HEIGHT));
-            view.setFocusable(true);
-            view.setFocusableInTouchMode(true);
-            view.setBackgroundColor(getResources().getColor(R.color.default_background));
-            view.setTextColor(Color.WHITE);
-            view.setGravity(Gravity.CENTER);
-            return new ViewHolder(view);
-        }
-
-        @Override
-        public void onBindViewHolder(ViewHolder viewHolder, Object item) {
-            ((TextView) viewHolder.view).setText((String) item);
-        }
-
-        @Override
-        public void onUnbindViewHolder(ViewHolder viewHolder) {
-        }
-    }
-
-    private void updateRecommendations() {
-        Intent recommendationIntent = new Intent(getActivity(), UpdateRecommendationsService.class);
-        getActivity().startService(recommendationIntent);
-    }
-}

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/SearchFragment.java b/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/SearchFragment.java
deleted file mode 100644
index 49f4689..0000000
--- a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/SearchFragment.java
+++ /dev/null

@@ -1,136 +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.leanback;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v17.leanback.widget.ArrayObjectAdapter;
-import android.support.v17.leanback.widget.HeaderItem;
-import android.support.v17.leanback.widget.ListRow;
-import android.support.v17.leanback.widget.ListRowPresenter;
-import android.support.v17.leanback.widget.ObjectAdapter;
-import android.support.v17.leanback.widget.OnItemClickedListener;
-import android.support.v17.leanback.widget.Row;
-import android.text.TextUtils;
-import android.util.Log;
-
-/*
- * This class demonstrates how to do in-app search 
- */
-@SuppressLint("DefaultLocale")
-public class SearchFragment extends android.support.v17.leanback.app.SearchFragment
-        implements android.support.v17.leanback.app.SearchFragment.SearchResultProvider {
-    private static final String TAG = "SearchFragment";
-    private static final int SEARCH_DELAY_MS = 300;
-
-    private ArrayObjectAdapter mRowsAdapter;
-    private Handler mHandler = new Handler();
-    private SearchRunnable mDelayedLoad;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
-        setSearchResultProvider(this);
-        setOnItemClickedListener(getDefaultItemClickedListener());
-        mDelayedLoad = new SearchRunnable();
-    }
-
-    @Override
-    public ObjectAdapter getResultsAdapter() {
-        return mRowsAdapter;
-    }
-
-    private void queryByWords(String words) {
-        mRowsAdapter.clear();
-        if (!TextUtils.isEmpty(words)) {
-            mDelayedLoad.setSearchQuery(words);
-            mHandler.removeCallbacks(mDelayedLoad);
-            mHandler.postDelayed(mDelayedLoad, SEARCH_DELAY_MS);
-        }
-    }
-
-    @Override
-    public boolean onQueryTextChange(String newQuery) {
-        Log.i(TAG, String.format("Search Query Text Change %s", newQuery));
-        queryByWords(newQuery);
-        return true;
-    }
-
-    @Override
-    public boolean onQueryTextSubmit(String query) {
-        Log.i(TAG, String.format("Search Query Text Submit %s", query));
-        queryByWords(query);
-        return true;
-    }
-
-    private void loadRows(String query) {
-        HashMap<String, List<Movie>> movies = VideoProvider.getMovieList();
-        ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(new CardPresenter());
-        for (Map.Entry<String, List<Movie>> entry : movies.entrySet())
-        {
-            for (int i = 0; i < entry.getValue().size(); i++) {
-                Movie movie = entry.getValue().get(i);
-                if (movie.getTitle().toLowerCase(Locale.ENGLISH)
-                        .indexOf(query.toLowerCase(Locale.ENGLISH)) >= 0
-                        || movie.getDescription().toLowerCase(Locale.ENGLISH)
-                                .indexOf(query.toLowerCase(Locale.ENGLISH)) >= 0) {
-                    listRowAdapter.add(movie);
-                }
-            }
-        }
-        HeaderItem header = new HeaderItem(0, getResources().getString(R.string.search_results),
-                null);
-        mRowsAdapter.add(new ListRow(header, listRowAdapter));
-    }
-
-    protected OnItemClickedListener getDefaultItemClickedListener() {
-        return new OnItemClickedListener() {
-            @Override
-            public void onItemClicked(Object item, Row row) {
-                if (item instanceof Movie) {
-                    Movie movie = (Movie) item;
-                    Intent intent = new Intent(getActivity(), DetailsActivity.class);
-                    intent.putExtra(getResources().getString(R.string.movie), movie);
-                    startActivity(intent);
-                }
-            }
-        };
-    }
-
-    private class SearchRunnable implements Runnable {
-
-        private volatile String searchQuery;
-
-        public SearchRunnable() {
-        }
-
-        public void run() {
-            loadRows(searchQuery);
-        }
-
-        public void setSearchQuery(String value) {
-            this.searchQuery = value;
-        }
-    }
-}

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/UpdateRecommendationsService.java b/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/UpdateRecommendationsService.java
deleted file mode 100644
index d6fec30..0000000
--- a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/UpdateRecommendationsService.java
+++ /dev/null

@@ -1,94 +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.leanback;
-
-import android.app.IntentService;
-import android.app.PendingIntent;
-import android.app.TaskStackBuilder;
-import android.content.Intent;
-import android.util.Log;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/*
- * This class builds up to MAX_RECOMMMENDATIONS of recommendations and defines what happens 
- * when they're clicked from Recommendations seciton on Home screen
- */
-public class UpdateRecommendationsService extends IntentService {
-    private static final String TAG = "UpdateRecommendationsService";
-    private static final int MAX_RECOMMENDATIONS = 3;
-
-    public UpdateRecommendationsService() {
-        super("RecommendationService");
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-        Log.d(TAG, "Updating recommendation cards");
-        HashMap<String, List<Movie>> recommendations = VideoProvider.getMovieList();
-
-        int count = 0;
-
-        try {
-            RecommendationBuilder builder = new RecommendationBuilder()
-                    .setContext(getApplicationContext())
-                    .setSmallIcon(R.drawable.videos_by_google_icon);
-
-            for (Map.Entry<String, List<Movie>> entry : recommendations.entrySet())
-            {
-                for (int i = 0; i < entry.getValue().size(); i++) {
-                    Movie movie = entry.getValue().get(i);
-                    Log.d(TAG, "Recommendation - " + movie.getTitle());
-
-                    builder.setBackground(movie.getCardImageUrl())
-                            .setId(count + 1)
-                            .setPriority(MAX_RECOMMENDATIONS - count)
-                            .setTitle(movie.getTitle())
-                            .setDescription(getString(R.string.popular_header))
-                            .setImage(movie.getCardImageUrl())
-                            .setIntent(buildPendingIntent(movie))
-                            .build();
-
-                    if (++count >= MAX_RECOMMENDATIONS) {
-                        break;
-                    }
-                }
-                if (++count >= MAX_RECOMMENDATIONS) {
-                    break;
-                }
-            }
-        } catch (IOException e) {
-            Log.e(TAG, "Unable to update recommendation", e);
-        }
-    }
-
-    private PendingIntent buildPendingIntent(Movie movie) {
-        Intent detailsIntent = new Intent(this, DetailsActivity.class);
-        detailsIntent.putExtra("Movie", movie);
-
-        TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
-        stackBuilder.addParentStack(DetailsActivity.class);
-        stackBuilder.addNextIntent(detailsIntent);
-        // Ensure a unique PendingIntents, otherwise all recommendations end up with the same
-        // PendingIntent
-        detailsIntent.setAction(Long.toString(movie.getId()));
-
-        PendingIntent intent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
-        return intent;
-    }
-}

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/VerticalGridFragment.java b/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/VerticalGridFragment.java
deleted file mode 100644
index 8d42f78..0000000
--- a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/VerticalGridFragment.java
+++ /dev/null

@@ -1,90 +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.leanback;
-
-import java.util.*;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v17.leanback.widget.ArrayObjectAdapter;
-import android.support.v17.leanback.widget.OnItemClickedListener;
-import android.support.v17.leanback.widget.OnItemSelectedListener;
-import android.support.v17.leanback.widget.Row;
-import android.support.v17.leanback.widget.VerticalGridPresenter;
-import android.util.Log;
-
-/*
- * VerticalGridFragment shows a grid of videos
- */
-public class VerticalGridFragment extends android.support.v17.leanback.app.VerticalGridFragment {
-    private static final String TAG = "VerticalGridFragment";
-
-    private static final int NUM_COLUMNS = 5;
-
-    private ArrayObjectAdapter mAdapter;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        Log.i(TAG, "onCreate");
-        super.onCreate(savedInstanceState);
-
-        setTitle(getString(R.string.vertical_grid_title));
-
-        setupFragment();
-    }
-
-    private void setupFragment() {
-        VerticalGridPresenter gridPresenter = new VerticalGridPresenter();
-        gridPresenter.setNumberOfColumns(NUM_COLUMNS);
-        setGridPresenter(gridPresenter);
-
-        mAdapter = new ArrayObjectAdapter(new CardPresenter());
-
-        long seed = System.nanoTime();
-
-        HashMap<String, List<Movie>> movies = VideoProvider.getMovieList();
-
-        for (Map.Entry<String, List<Movie>> entry : movies.entrySet())
-        {
-            List<Movie> list = entry.getValue();
-            Collections.shuffle(list, new Random(seed));
-            for (int j = 0; j < list.size(); j++) {
-                mAdapter.add(list.get(j));
-            }
-        }
-
-        setAdapter(mAdapter);
-
-        setOnItemSelectedListener(new OnItemSelectedListener() {
-            @Override
-            public void onItemSelected(Object item, Row row) {
-            }
-        });
-
-        setOnItemClickedListener(new OnItemClickedListener() {
-            @Override
-            public void onItemClicked(Object item, Row row) {
-                if (item instanceof Movie) {
-                    Movie movie = (Movie) item;
-                    Intent intent = new Intent(getActivity(), DetailsActivity.class);
-                    intent.putExtra(getString(R.string.movie), movie);
-                    startActivity(intent);
-                }
-            }
-        });
-
-    }
-
-}

diff --git a/prebuilts/androidtv/leanback/build.gradle b/prebuilts/androidtv/leanback/build.gradle
deleted file mode 100644
index a1d991f..0000000
--- a/prebuilts/androidtv/leanback/build.gradle
+++ /dev/null

@@ -1,19 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        mavenCentral()
-    }
-}

diff --git a/prebuilts/androidtv/leanback/gradle/wrapper/gradle-wrapper.jar b/prebuilts/androidtv/leanback/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/androidtv/leanback/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ

diff --git a/prebuilts/androidtv/leanback/gradle/wrapper/gradle-wrapper.properties b/prebuilts/androidtv/leanback/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 897ca3c..0000000
--- a/prebuilts/androidtv/leanback/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-#Fri Jul 11 18:48:36 PDT 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip

diff --git a/prebuilts/androidtv/leanback/gradlew b/prebuilts/androidtv/leanback/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/androidtv/leanback/gradlew
+++ /dev/null

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/prebuilts/androidtv/leanback/project.properties b/prebuilts/androidtv/leanback/project.properties
new file mode 100644
index 0000000..70b2922
--- /dev/null
+++ b/prebuilts/androidtv/leanback/project.properties

@@ -0,0 +1,16 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-19
+android.library.reference.1=../../1229585_support/v17/leanback
+android.library.reference.2=../../1229585_support/v7/appcompat

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/app_icon_quantum.png b/prebuilts/androidtv/leanback/res/drawable-hdpi/app_icon_quantum.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/app_icon_quantum.png
rename to prebuilts/androidtv/leanback/res/drawable-hdpi/app_icon_quantum.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/app_icon_quantum_card.png b/prebuilts/androidtv/leanback/res/drawable-hdpi/app_icon_quantum_card.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/app_icon_quantum_card.png
rename to prebuilts/androidtv/leanback/res/drawable-hdpi/app_icon_quantum_card.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/ic_av_play_dark.png b/prebuilts/androidtv/leanback/res/drawable-hdpi/ic_av_play_dark.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/ic_av_play_dark.png
rename to prebuilts/androidtv/leanback/res/drawable-hdpi/ic_av_play_dark.png
Binary files differ

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/androidtv/leanback/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/androidtv/leanback/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/videos_by_google_banner.png b/prebuilts/androidtv/leanback/res/drawable-hdpi/videos_by_google_banner.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/videos_by_google_banner.png
rename to prebuilts/androidtv/leanback/res/drawable-hdpi/videos_by_google_banner.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/videos_by_google_icon.png b/prebuilts/androidtv/leanback/res/drawable-hdpi/videos_by_google_icon.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/videos_by_google_icon.png
rename to prebuilts/androidtv/leanback/res/drawable-hdpi/videos_by_google_icon.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-ldpi/ic_launcher.png b/prebuilts/androidtv/leanback/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-ldpi/ic_launcher.png
rename to prebuilts/androidtv/leanback/res/drawable-ldpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/app_icon_quantum.png b/prebuilts/androidtv/leanback/res/drawable-mdpi/app_icon_quantum.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/app_icon_quantum.png
rename to prebuilts/androidtv/leanback/res/drawable-mdpi/app_icon_quantum.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/app_icon_quantum_card.png b/prebuilts/androidtv/leanback/res/drawable-mdpi/app_icon_quantum_card.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/app_icon_quantum_card.png
rename to prebuilts/androidtv/leanback/res/drawable-mdpi/app_icon_quantum_card.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/ic_av_pause_dark.png b/prebuilts/androidtv/leanback/res/drawable-mdpi/ic_av_pause_dark.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/ic_av_pause_dark.png
rename to prebuilts/androidtv/leanback/res/drawable-mdpi/ic_av_pause_dark.png
Binary files differ

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/androidtv/leanback/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/androidtv/leanback/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/videos_by_google_banner.png b/prebuilts/androidtv/leanback/res/drawable-mdpi/videos_by_google_banner.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/videos_by_google_banner.png
rename to prebuilts/androidtv/leanback/res/drawable-mdpi/videos_by_google_banner.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/videos_by_google_icon.png b/prebuilts/androidtv/leanback/res/drawable-mdpi/videos_by_google_icon.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/videos_by_google_icon.png
rename to prebuilts/androidtv/leanback/res/drawable-mdpi/videos_by_google_icon.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/app_icon_quantum.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/app_icon_quantum.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/app_icon_quantum.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/app_icon_quantum.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/app_icon_quantum_card.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/app_icon_quantum_card.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/app_icon_quantum_card.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/app_icon_quantum_card.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/card_background_default.9.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/card_background_default.9.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/card_background_default.9.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/card_background_default.9.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/default_background.xml b/prebuilts/androidtv/leanback/res/drawable-xhdpi/default_background.xml
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/default_background.xml
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/default_background.xml

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/grid_bg.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/grid_bg.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/grid_bg.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/grid_bg.png
Binary files differ

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_pause_playcontrol_focussed.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_pause_playcontrol_focussed.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_pause_playcontrol_focussed.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_pause_playcontrol_focussed.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_pause_playcontrol_normal.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_pause_playcontrol_normal.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_pause_playcontrol_normal.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_pause_playcontrol_normal.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_pause_playcontrol_pressed.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_pause_playcontrol_pressed.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_pause_playcontrol_pressed.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_pause_playcontrol_pressed.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_action_focussed.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_action_focussed.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_action_focussed.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_action_focussed.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_action_normal.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_action_normal.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_action_normal.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_action_normal.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_action_pressed.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_action_pressed.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_action_pressed.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_action_pressed.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_playcontrol_focussed.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_playcontrol_focussed.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_playcontrol_focussed.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_playcontrol_focussed.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_playcontrol_normal.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_playcontrol_normal.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_playcontrol_normal.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_playcontrol_normal.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_playcontrol_pressed.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_playcontrol_pressed.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_play_playcontrol_pressed.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/ic_play_playcontrol_pressed.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/scrubber_disabled.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/scrubber_disabled.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/scrubber_disabled.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/scrubber_disabled.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/scrubber_focussed.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/scrubber_focussed.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/scrubber_focussed.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/scrubber_focussed.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/scrubber_normal.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/scrubber_normal.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/scrubber_normal.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/scrubber_normal.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/scrubber_pressed.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/scrubber_pressed.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/scrubber_pressed.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/scrubber_pressed.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/shadow7.9.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/shadow7.9.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/shadow7.9.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/shadow7.9.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/videos_by_google_banner.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/videos_by_google_banner.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/videos_by_google_banner.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/videos_by_google_banner.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/videos_by_google_icon.png b/prebuilts/androidtv/leanback/res/drawable-xhdpi/videos_by_google_icon.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/videos_by_google_icon.png
rename to prebuilts/androidtv/leanback/res/drawable-xhdpi/videos_by_google_icon.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xxhdpi/app_icon_quantum.png b/prebuilts/androidtv/leanback/res/drawable-xxhdpi/app_icon_quantum.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xxhdpi/app_icon_quantum.png
rename to prebuilts/androidtv/leanback/res/drawable-xxhdpi/app_icon_quantum.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xxhdpi/app_icon_quantum_card.png b/prebuilts/androidtv/leanback/res/drawable-xxhdpi/app_icon_quantum_card.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xxhdpi/app_icon_quantum_card.png
rename to prebuilts/androidtv/leanback/res/drawable-xxhdpi/app_icon_quantum_card.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xxhdpi/videos_by_google_banner.png b/prebuilts/androidtv/leanback/res/drawable-xxhdpi/videos_by_google_banner.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xxhdpi/videos_by_google_banner.png
rename to prebuilts/androidtv/leanback/res/drawable-xxhdpi/videos_by_google_banner.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xxhdpi/videos_by_google_icon.png b/prebuilts/androidtv/leanback/res/drawable-xxhdpi/videos_by_google_icon.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xxhdpi/videos_by_google_icon.png
rename to prebuilts/androidtv/leanback/res/drawable-xxhdpi/videos_by_google_icon.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable/app_icon_quantum.png b/prebuilts/androidtv/leanback/res/drawable/app_icon_quantum.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable/app_icon_quantum.png
rename to prebuilts/androidtv/leanback/res/drawable/app_icon_quantum.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable/app_icon_quantum_card.png b/prebuilts/androidtv/leanback/res/drawable/app_icon_quantum_card.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable/app_icon_quantum_card.png
rename to prebuilts/androidtv/leanback/res/drawable/app_icon_quantum_card.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable/details_img.png b/prebuilts/androidtv/leanback/res/drawable/details_img.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable/details_img.png
rename to prebuilts/androidtv/leanback/res/drawable/details_img.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable/ic_action_a.png b/prebuilts/androidtv/leanback/res/drawable/ic_action_a.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable/ic_action_a.png
rename to prebuilts/androidtv/leanback/res/drawable/ic_action_a.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable/ic_title.png b/prebuilts/androidtv/leanback/res/drawable/ic_title.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable/ic_title.png
rename to prebuilts/androidtv/leanback/res/drawable/ic_title.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable/movie.png b/prebuilts/androidtv/leanback/res/drawable/movie.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable/movie.png
rename to prebuilts/androidtv/leanback/res/drawable/movie.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable/player_bg_gradient_dark.xml b/prebuilts/androidtv/leanback/res/drawable/player_bg_gradient_dark.xml
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable/player_bg_gradient_dark.xml
rename to prebuilts/androidtv/leanback/res/drawable/player_bg_gradient_dark.xml

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable/shadow7.9.png b/prebuilts/androidtv/leanback/res/drawable/shadow7.9.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable/shadow7.9.png
rename to prebuilts/androidtv/leanback/res/drawable/shadow7.9.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable/videos_by_google_banner.png b/prebuilts/androidtv/leanback/res/drawable/videos_by_google_banner.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable/videos_by_google_banner.png
rename to prebuilts/androidtv/leanback/res/drawable/videos_by_google_banner.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable/videos_by_google_icon.png b/prebuilts/androidtv/leanback/res/drawable/videos_by_google_icon.png
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable/videos_by_google_icon.png
rename to prebuilts/androidtv/leanback/res/drawable/videos_by_google_icon.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/layout/details.xml b/prebuilts/androidtv/leanback/res/layout/details.xml
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/layout/details.xml
rename to prebuilts/androidtv/leanback/res/layout/details.xml

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/layout/main.xml b/prebuilts/androidtv/leanback/res/layout/main.xml
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/layout/main.xml
rename to prebuilts/androidtv/leanback/res/layout/main.xml

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/layout/movie_card.xml b/prebuilts/androidtv/leanback/res/layout/movie_card.xml
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/layout/movie_card.xml
rename to prebuilts/androidtv/leanback/res/layout/movie_card.xml

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/layout/player_activity.xml b/prebuilts/androidtv/leanback/res/layout/player_activity.xml
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/layout/player_activity.xml
rename to prebuilts/androidtv/leanback/res/layout/player_activity.xml

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/layout/search.xml b/prebuilts/androidtv/leanback/res/layout/search.xml
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/layout/search.xml
rename to prebuilts/androidtv/leanback/res/layout/search.xml

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/layout/vertical_grid.xml b/prebuilts/androidtv/leanback/res/layout/vertical_grid.xml
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/layout/vertical_grid.xml
rename to prebuilts/androidtv/leanback/res/layout/vertical_grid.xml

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/values/colors.xml b/prebuilts/androidtv/leanback/res/values/colors.xml
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/values/colors.xml
rename to prebuilts/androidtv/leanback/res/values/colors.xml

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/values/strings.xml b/prebuilts/androidtv/leanback/res/values/strings.xml
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/values/strings.xml
rename to prebuilts/androidtv/leanback/res/values/strings.xml

diff --git a/prebuilts/androidtv/leanback/settings.gradle b/prebuilts/androidtv/leanback/settings.gradle
deleted file mode 100644
index e7b4def..0000000
--- a/prebuilts/androidtv/leanback/settings.gradle
+++ /dev/null

@@ -1 +0,0 @@
-include ':app'

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/BootupActivity.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/BootupActivity.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/BootupActivity.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/BootupActivity.java

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/CardPresenter.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/CardPresenter.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/CardPresenter.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/CardPresenter.java

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/DetailsActivity.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/DetailsActivity.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/DetailsActivity.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/DetailsActivity.java

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/DetailsDescriptionPresenter.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/DetailsDescriptionPresenter.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/DetailsDescriptionPresenter.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/DetailsDescriptionPresenter.java

diff --git a/prebuilts/androidtv/leanback/src/com/example/android/leanback/LeanbackDetailsFragment.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/LeanbackDetailsFragment.java
new file mode 100644
index 0000000..21c3a70
--- /dev/null
+++ b/prebuilts/androidtv/leanback/src/com/example/android/leanback/LeanbackDetailsFragment.java

@@ -0,0 +1,193 @@
+/*
+ * 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.leanback;
+
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.v17.leanback.app.BackgroundManager;
+import android.support.v17.leanback.app.DetailsFragment;
+import android.support.v17.leanback.widget.Action;
+import android.support.v17.leanback.widget.ArrayObjectAdapter;
+import android.support.v17.leanback.widget.ClassPresenterSelector;
+import android.support.v17.leanback.widget.DetailsOverviewRow;
+import android.support.v17.leanback.widget.DetailsOverviewRowPresenter;
+import android.support.v17.leanback.widget.HeaderItem;
+import android.support.v17.leanback.widget.ListRow;
+import android.support.v17.leanback.widget.ListRowPresenter;
+import android.support.v17.leanback.widget.OnActionClickedListener;
+import android.support.v17.leanback.widget.OnItemClickedListener;
+import android.support.v17.leanback.widget.Row;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.squareup.picasso.Picasso;
+import com.squareup.picasso.Target;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+
+/*
+ * LeanbackDetailsFragment extends DetailsFragment, a Wrapper fragment for leanback details screens.
+ * It shows a detailed view of video and its meta plus related videos.
+ */
+public class LeanbackDetailsFragment extends DetailsFragment {
+    private static final String TAG = "DetailsFragment";
+
+    private static final int ACTION_WATCH_TRAILER = 1;
+    private static final int ACTION_RENT = 2;
+    private static final int ACTION_BUY = 3;
+
+    private static final int DETAIL_THUMB_WIDTH = 274;
+    private static final int DETAIL_THUMB_HEIGHT = 274;
+
+    private Movie selectedMovie;
+
+    private Drawable mDefaultBackground;
+    private Target mBackgroundTarget;
+    private DisplayMetrics mMetrics;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        Log.i(TAG, "onCreate DetailsFragment");
+        super.onCreate(savedInstanceState);
+
+        BackgroundManager backgroundManager = BackgroundManager.getInstance(getActivity());
+        backgroundManager.attach(getActivity().getWindow());
+        mBackgroundTarget = new PicassoBackgroundManagerTarget(backgroundManager);
+
+        mDefaultBackground = getResources().getDrawable(R.drawable.default_background);
+
+        mMetrics = new DisplayMetrics();
+        getActivity().getWindowManager().getDefaultDisplay().getMetrics(mMetrics);
+
+        selectedMovie = (Movie) getActivity().getIntent().getSerializableExtra("Movie");
+        Log.d(TAG, "DetailsActivity movie: " + selectedMovie.toString());
+        new DetailRowBuilderTask().execute(selectedMovie);
+
+        setOnItemClickedListener(getDefaultItemClickedListener());
+
+    }
+
+    private class DetailRowBuilderTask extends AsyncTask<Movie, Integer, DetailsOverviewRow> {
+        @Override
+        protected DetailsOverviewRow doInBackground(Movie... movies) {
+            selectedMovie = movies[0];
+
+            Log.d(TAG, "doInBackground: " + selectedMovie.toString());
+            DetailsOverviewRow row = new DetailsOverviewRow(selectedMovie);
+            try {
+                Bitmap poster = Picasso.with(getActivity())
+                        .load(selectedMovie.getCardImageUrl())
+                        .resize(Utils.dpToPx(DETAIL_THUMB_WIDTH, getActivity()
+                                .getApplicationContext()),
+                                Utils.dpToPx(DETAIL_THUMB_HEIGHT, getActivity()
+                                        .getApplicationContext()))
+                        .centerCrop()
+                        .get();
+                row.setImageBitmap(getActivity(), poster);
+                updateBackground(selectedMovie.getBackgroundImageURI());
+            } catch (IOException e) {
+            }
+
+            row.addAction(new Action(ACTION_WATCH_TRAILER, getResources().getString(
+                    R.string.watch_trailer_1), getResources().getString(R.string.watch_trailer_2)));
+            row.addAction(new Action(ACTION_RENT, getResources().getString(R.string.rent_1),
+                    getResources().getString(R.string.rent_2)));
+            row.addAction(new Action(ACTION_BUY, getResources().getString(R.string.buy_1),
+                    getResources().getString(R.string.buy_2)));
+            return row;
+        }
+
+        @Override
+        protected void onPostExecute(DetailsOverviewRow detailRow) {
+            ClassPresenterSelector ps = new ClassPresenterSelector();
+            DetailsOverviewRowPresenter dorPresenter =
+                    new DetailsOverviewRowPresenter(new DetailsDescriptionPresenter());
+            // set detail background and style
+            dorPresenter.setBackgroundColor(getResources().getColor(R.color.detail_background));
+            dorPresenter.setStyleLarge(true);
+            dorPresenter.setOnActionClickedListener(new OnActionClickedListener() {
+                @Override
+                public void onActionClicked(Action action) {
+                    if (action.getId() == ACTION_WATCH_TRAILER) {
+                        Intent intent = new Intent(getActivity(), PlayerActivity.class);
+                        intent.putExtra(getResources().getString(R.string.movie), selectedMovie);
+                        intent.putExtra(getResources().getString(R.string.should_start), true);
+                        startActivity(intent);
+                    }
+                    else {
+                        Toast.makeText(getActivity(), action.toString(), Toast.LENGTH_SHORT).show();
+                    }
+                }
+            });
+
+            ps.addClassPresenter(DetailsOverviewRow.class, dorPresenter);
+            ps.addClassPresenter(ListRow.class,
+                    new ListRowPresenter());
+
+            ArrayObjectAdapter adapter = new ArrayObjectAdapter(ps);
+            adapter.add(detailRow);
+
+            String subcategories[] = {
+                    getString(R.string.related_movies)
+            };
+            HashMap<String, List<Movie>> movies = VideoProvider.getMovieList();
+
+            ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(new CardPresenter());
+            for (HashMap.Entry<String, List<Movie>> entry : movies.entrySet())
+            {
+                if (selectedMovie.getCategory().indexOf(entry.getKey()) >= 0) {
+                    List<Movie> list = entry.getValue();
+                    for (int j = 0; j < list.size(); j++) {
+                        listRowAdapter.add(list.get(j));
+                    }
+                }
+            }
+            HeaderItem header = new HeaderItem(0, subcategories[0], null);
+            adapter.add(new ListRow(header, listRowAdapter));
+
+            setAdapter(adapter);
+        }
+
+    }
+
+    protected OnItemClickedListener getDefaultItemClickedListener() {
+        return new OnItemClickedListener() {
+            @Override
+            public void onItemClicked(Object item, Row row) {
+                if (item instanceof Movie) {
+                    Movie movie = (Movie) item;
+                    Intent intent = new Intent(getActivity(), DetailsActivity.class);
+                    intent.putExtra(getResources().getString(R.string.movie), movie);
+                    startActivity(intent);
+                }
+            }
+        };
+    }
+
+    protected void updateBackground(URI uri) {
+        Picasso.with(getActivity())
+                .load(uri.toString())
+                .resize(mMetrics.widthPixels, mMetrics.heightPixels)
+                .error(mDefaultBackground)
+                .into(mBackgroundTarget);
+    }
+}

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/MainActivity.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/MainActivity.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/MainActivity.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/MainActivity.java

diff --git a/prebuilts/androidtv/leanback/src/com/example/android/leanback/MainFragment.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/MainFragment.java
new file mode 100644
index 0000000..5092165
--- /dev/null
+++ b/prebuilts/androidtv/leanback/src/com/example/android/leanback/MainFragment.java

@@ -0,0 +1,294 @@
+/*
+ * 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.leanback;
+
+import android.app.LoaderManager;
+import android.content.Intent;
+import android.content.Loader;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v17.leanback.app.BackgroundManager;
+import android.support.v17.leanback.app.BrowseFragment;
+import android.support.v17.leanback.widget.ArrayObjectAdapter;
+import android.support.v17.leanback.widget.HeaderItem;
+import android.support.v17.leanback.widget.ListRow;
+import android.support.v17.leanback.widget.ListRowPresenter;
+import android.support.v17.leanback.widget.OnItemClickedListener;
+import android.support.v17.leanback.widget.OnItemSelectedListener;
+import android.support.v17.leanback.widget.Presenter;
+import android.support.v17.leanback.widget.Row;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.squareup.picasso.Picasso;
+import com.squareup.picasso.Target;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/*
+ * Main class to show BrowseFragment with header and rows of videos
+ */
+public class MainFragment extends BrowseFragment implements
+        LoaderManager.LoaderCallbacks<HashMap<String, List<Movie>>> {
+    private static final String TAG = "MainFragment";
+
+    private static int BACKGROUND_UPDATE_DELAY = 300;
+    private static int GRID_ITEM_WIDTH = 200;
+    private static int GRID_ITEM_HEIGHT = 200;
+
+    private ArrayObjectAdapter mRowsAdapter;
+    private Drawable mDefaultBackground;
+    private Target mBackgroundTarget;
+    private DisplayMetrics mMetrics;
+    private Timer mBackgroundTimer;
+    private final Handler mHandler = new Handler();
+    private URI mBackgroundURI;
+    private static String mVideosUrl;
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        Log.i(TAG, "onCreate");
+        super.onActivityCreated(savedInstanceState);
+
+        loadVideoData();
+
+        prepareBackgroundManager();
+        setupUIElements();
+        setupEventListeners();
+    }
+
+    private void prepareBackgroundManager() {
+        BackgroundManager backgroundManager = BackgroundManager.getInstance(getActivity());
+        backgroundManager.attach(getActivity().getWindow());
+        mBackgroundTarget = new PicassoBackgroundManagerTarget(backgroundManager);
+        mDefaultBackground = getResources().getDrawable(R.drawable.default_background);
+        mMetrics = new DisplayMetrics();
+        getActivity().getWindowManager().getDefaultDisplay().getMetrics(mMetrics);
+    }
+
+    private void setupUIElements() {
+        // setBadgeDrawable(getActivity().getResources().getDrawable(R.drawable.videos_by_google_banner));
+        setTitle(getString(R.string.browse_title)); // Badge, when set, takes precedent over title
+        setHeadersState(HEADERS_ENABLED);
+        setHeadersTransitionOnBackEnabled(true);
+        // set fastLane (or headers) background color
+        setBrandColor(getResources().getColor(R.color.fastlane_background));
+        // set search icon color
+        setSearchAffordanceColor(getResources().getColor(R.color.search_opaque));
+    }
+
+    private void loadVideoData() {
+        VideoProvider.setContext(getActivity());
+        mVideosUrl = getActivity().getResources().getString(R.string.catalog_url);
+        getLoaderManager().initLoader(0, null, this);
+    }
+
+    private void setupEventListeners() {
+        setOnSearchClickedListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(getActivity(), SearchActivity.class);
+                startActivity(intent);
+            }
+        });
+
+        setOnItemSelectedListener(getDefaultItemSelectedListener());
+        setOnItemClickedListener(getDefaultItemClickedListener());
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see android.support.v4.app.LoaderManager.LoaderCallbacks#onCreateLoader(int,
+     * android.os.Bundle)
+     */
+    @Override
+    public Loader<HashMap<String, List<Movie>>> onCreateLoader(int arg0, Bundle arg1) {
+        Log.d(TAG, "VideoItemLoader created ");
+        return new VideoItemLoader(getActivity(), mVideosUrl);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see android.support.v4.app.LoaderManager.LoaderCallbacks#onLoadFinished(android
+     * .support.v4.content.Loader, java.lang.Object)
+     */
+    @Override
+    public void onLoadFinished(Loader<HashMap<String, List<Movie>>> arg0,
+            HashMap<String, List<Movie>> data) {
+
+        mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
+        CardPresenter cardPresenter = new CardPresenter();
+
+        int i = 0;
+
+        for (HashMap.Entry<String, List<Movie>> entry : data.entrySet())
+        {
+            ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(cardPresenter);
+            List<Movie> list = entry.getValue();
+
+            for (int j = 0; j < list.size(); j++) {
+                listRowAdapter.add(list.get(j));
+            }
+            HeaderItem header = new HeaderItem(i, entry.getKey(), null);
+            i++;
+            mRowsAdapter.add(new ListRow(header, listRowAdapter));
+        }
+
+        HeaderItem gridHeader = new HeaderItem(i, getResources().getString(R.string.preferences),
+                null);
+
+        GridItemPresenter gridPresenter = new GridItemPresenter();
+        ArrayObjectAdapter gridRowAdapter = new ArrayObjectAdapter(gridPresenter);
+        gridRowAdapter.add(getResources().getString(R.string.grid_view));
+        gridRowAdapter.add(getResources().getString(R.string.send_feeback));
+        gridRowAdapter.add(getResources().getString(R.string.personal_settings));
+        mRowsAdapter.add(new ListRow(gridHeader, gridRowAdapter));
+
+        setAdapter(mRowsAdapter);
+
+        updateRecommendations();
+    }
+
+    @Override
+    public void onLoaderReset(Loader<HashMap<String, List<Movie>>> arg0) {
+        mRowsAdapter.clear();
+    }
+
+    protected OnItemSelectedListener getDefaultItemSelectedListener() {
+        return new OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(Object item, Row row) {
+                if (item instanceof Movie) {
+                    mBackgroundURI = ((Movie) item).getBackgroundImageURI();
+                    startBackgroundTimer();
+                }
+            }
+        };
+    }
+
+    protected OnItemClickedListener getDefaultItemClickedListener() {
+        return new OnItemClickedListener() {
+            @Override
+            public void onItemClicked(Object item, Row row) {
+                if (item instanceof Movie) {
+                    Movie movie = (Movie) item;
+                    Log.d(TAG, "Item: " + item.toString());
+                    Intent intent = new Intent(getActivity(), DetailsActivity.class);
+                    intent.putExtra(getString(R.string.movie), movie);
+                    startActivity(intent);
+                }
+                else if (item instanceof String) {
+                    if (((String) item).indexOf(getResources().getString(R.string.grid_view)) >= 0) {
+                        Intent intent = new Intent(getActivity(), VerticalGridActivity.class);
+                        startActivity(intent);
+                    }
+                    else {
+                        Toast.makeText(getActivity(), ((String) item), Toast.LENGTH_SHORT)
+                                .show();
+                    }
+                }
+
+            }
+        };
+    }
+
+    protected void setDefaultBackground(Drawable background) {
+        mDefaultBackground = background;
+    }
+
+    protected void setDefaultBackground(int resourceId) {
+        mDefaultBackground = getResources().getDrawable(resourceId);
+    }
+
+    protected void updateBackground(URI uri) {
+        Picasso.with(getActivity())
+                .load(uri.toString())
+                .resize(mMetrics.widthPixels, mMetrics.heightPixels)
+                .centerCrop()
+                .error(mDefaultBackground)
+                .into(mBackgroundTarget);
+    }
+
+    protected void updateBackground(Drawable drawable) {
+        BackgroundManager.getInstance(getActivity()).setDrawable(drawable);
+    }
+
+    protected void clearBackground() {
+        BackgroundManager.getInstance(getActivity()).setDrawable(mDefaultBackground);
+    }
+
+    private void startBackgroundTimer() {
+        if (null != mBackgroundTimer) {
+            mBackgroundTimer.cancel();
+        }
+        mBackgroundTimer = new Timer();
+        mBackgroundTimer.schedule(new UpdateBackgroundTask(), BACKGROUND_UPDATE_DELAY);
+    }
+
+    private class UpdateBackgroundTask extends TimerTask {
+
+        @Override
+        public void run() {
+            mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    if (mBackgroundURI != null) {
+                        updateBackground(mBackgroundURI);
+                    }
+                }
+            });
+        }
+    }
+
+    private class GridItemPresenter extends Presenter {
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent) {
+            TextView view = new TextView(parent.getContext());
+            view.setLayoutParams(new ViewGroup.LayoutParams(GRID_ITEM_WIDTH, GRID_ITEM_HEIGHT));
+            view.setFocusable(true);
+            view.setFocusableInTouchMode(true);
+            view.setBackgroundColor(getResources().getColor(R.color.default_background));
+            view.setTextColor(Color.WHITE);
+            view.setGravity(Gravity.CENTER);
+            return new ViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(ViewHolder viewHolder, Object item) {
+            ((TextView) viewHolder.view).setText((String) item);
+        }
+
+        @Override
+        public void onUnbindViewHolder(ViewHolder viewHolder) {
+        }
+    }
+
+    private void updateRecommendations() {
+        Intent recommendationIntent = new Intent(getActivity(), UpdateRecommendationsService.class);
+        getActivity().startService(recommendationIntent);
+    }
+}

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/Movie.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/Movie.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/Movie.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/Movie.java

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/PicassoBackgroundManagerTarget.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/PicassoBackgroundManagerTarget.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/PicassoBackgroundManagerTarget.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/PicassoBackgroundManagerTarget.java

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/PlayerActivity.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/PlayerActivity.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/PlayerActivity.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/PlayerActivity.java

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/RecommendationBuilder.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/RecommendationBuilder.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/RecommendationBuilder.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/RecommendationBuilder.java

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/SearchActivity.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/SearchActivity.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/SearchActivity.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/SearchActivity.java

diff --git a/prebuilts/androidtv/leanback/src/com/example/android/leanback/SearchFragment.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/SearchFragment.java
new file mode 100644
index 0000000..944309a
--- /dev/null
+++ b/prebuilts/androidtv/leanback/src/com/example/android/leanback/SearchFragment.java

@@ -0,0 +1,135 @@
+/*
+ * 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.leanback;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v17.leanback.widget.ArrayObjectAdapter;
+import android.support.v17.leanback.widget.HeaderItem;
+import android.support.v17.leanback.widget.ListRow;
+import android.support.v17.leanback.widget.ListRowPresenter;
+import android.support.v17.leanback.widget.ObjectAdapter;
+import android.support.v17.leanback.widget.OnItemClickedListener;
+import android.support.v17.leanback.widget.Row;
+import android.text.TextUtils;
+import android.util.Log;
+
+/*
+ * This class demonstrates how to do in-app search 
+ */
+@SuppressLint("DefaultLocale")
+public class SearchFragment extends android.support.v17.leanback.app.SearchFragment
+        implements android.support.v17.leanback.app.SearchFragment.SearchResultProvider {
+    private static final String TAG = "SearchFragment";
+    private static final int SEARCH_DELAY_MS = 300;
+
+    private ArrayObjectAdapter mRowsAdapter;
+    private Handler mHandler = new Handler();
+    private SearchRunnable mDelayedLoad;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
+        setSearchResultProvider(this);
+        setOnItemClickedListener(getDefaultItemClickedListener());
+        mDelayedLoad = new SearchRunnable();
+    }
+
+    @Override
+    public ObjectAdapter getResultsAdapter() {
+        return mRowsAdapter;
+    }
+
+    private void queryByWords(String words) {
+        mRowsAdapter.clear();
+        if (!TextUtils.isEmpty(words)) {
+            mDelayedLoad.setSearchQuery(words);
+            mHandler.removeCallbacks(mDelayedLoad);
+            mHandler.postDelayed(mDelayedLoad, SEARCH_DELAY_MS);
+        }
+    }
+
+    @Override
+    public boolean onQueryTextChange(String newQuery) {
+        Log.i(TAG, String.format("Search Query Text Change %s", newQuery));
+        queryByWords(newQuery);
+        return true;
+    }
+
+    @Override
+    public boolean onQueryTextSubmit(String query) {
+        Log.i(TAG, String.format("Search Query Text Submit %s", query));
+        queryByWords(query);
+        return true;
+    }
+
+    private void loadRows(String query) {
+        HashMap<String, List<Movie>> movies = VideoProvider.getMovieList();
+        ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(new CardPresenter());
+        for (HashMap.Entry<String, List<Movie>> entry : movies.entrySet())
+        {
+            for (int i = 0; i < entry.getValue().size(); i++) {
+                Movie movie = entry.getValue().get(i);
+                if (movie.getTitle().toLowerCase(Locale.ENGLISH)
+                        .indexOf(query.toLowerCase(Locale.ENGLISH)) >= 0
+                        || movie.getDescription().toLowerCase(Locale.ENGLISH)
+                                .indexOf(query.toLowerCase(Locale.ENGLISH)) >= 0) {
+                    listRowAdapter.add(movie);
+                }
+            }
+        }
+        HeaderItem header = new HeaderItem(0, getResources().getString(R.string.search_results),
+                null);
+        mRowsAdapter.add(new ListRow(header, listRowAdapter));
+    }
+
+    protected OnItemClickedListener getDefaultItemClickedListener() {
+        return new OnItemClickedListener() {
+            @Override
+            public void onItemClicked(Object item, Row row) {
+                if (item instanceof Movie) {
+                    Movie movie = (Movie) item;
+                    Intent intent = new Intent(getActivity(), DetailsActivity.class);
+                    intent.putExtra(getResources().getString(R.string.movie), movie);
+                    startActivity(intent);
+                }
+            }
+        };
+    }
+
+    private class SearchRunnable implements Runnable {
+
+        private volatile String searchQuery;
+
+        public SearchRunnable() {
+        }
+
+        public void run() {
+            loadRows(searchQuery);
+        }
+
+        public void setSearchQuery(String value) {
+            this.searchQuery = value;
+        }
+    }
+}

diff --git a/prebuilts/androidtv/leanback/src/com/example/android/leanback/UpdateRecommendationsService.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/UpdateRecommendationsService.java
new file mode 100644
index 0000000..f0695e8
--- /dev/null
+++ b/prebuilts/androidtv/leanback/src/com/example/android/leanback/UpdateRecommendationsService.java

@@ -0,0 +1,93 @@
+/*
+ * 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.leanback;
+
+import android.app.IntentService;
+import android.app.PendingIntent;
+import android.app.TaskStackBuilder;
+import android.content.Intent;
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+
+/*
+ * This class builds up to MAX_RECOMMMENDATIONS of recommendations and defines what happens 
+ * when they're clicked from Recommendations seciton on Home screen
+ */
+public class UpdateRecommendationsService extends IntentService {
+    private static final String TAG = "UpdateRecommendationsService";
+    private static final int MAX_RECOMMENDATIONS = 3;
+
+    public UpdateRecommendationsService() {
+        super("RecommendationService");
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        Log.d(TAG, "Updating recommendation cards");
+        HashMap<String, List<Movie>> recommendations = VideoProvider.getMovieList();
+
+        int count = 0;
+
+        try {
+            RecommendationBuilder builder = new RecommendationBuilder()
+                    .setContext(getApplicationContext())
+                    .setSmallIcon(R.drawable.videos_by_google_icon);
+
+            for (HashMap.Entry<String, List<Movie>> entry : recommendations.entrySet())
+            {
+                for (int i = 0; i < entry.getValue().size(); i++) {
+                    Movie movie = entry.getValue().get(i);
+                    Log.d(TAG, "Recommendation - " + movie.getTitle());
+
+                    builder.setBackground(movie.getCardImageUrl())
+                            .setId(count + 1)
+                            .setPriority(MAX_RECOMMENDATIONS - count)
+                            .setTitle(movie.getTitle())
+                            .setDescription(getString(R.string.popular_header))
+                            .setImage(movie.getCardImageUrl())
+                            .setIntent(buildPendingIntent(movie))
+                            .build();
+
+                    if (++count >= MAX_RECOMMENDATIONS) {
+                        break;
+                    }
+                }
+                if (++count >= MAX_RECOMMENDATIONS) {
+                    break;
+                }
+            }
+        } catch (IOException e) {
+            Log.e(TAG, "Unable to update recommendation", e);
+        }
+    }
+
+    private PendingIntent buildPendingIntent(Movie movie) {
+        Intent detailsIntent = new Intent(this, DetailsActivity.class);
+        detailsIntent.putExtra("Movie", movie);
+
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
+        stackBuilder.addParentStack(DetailsActivity.class);
+        stackBuilder.addNextIntent(detailsIntent);
+        // Ensure a unique PendingIntents, otherwise all recommendations end up with the same
+        // PendingIntent
+        detailsIntent.setAction(Long.toString(movie.getId()));
+
+        PendingIntent intent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
+        return intent;
+    }
+}

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/Utils.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/Utils.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/Utils.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/Utils.java

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/VerticalGridActivity.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/VerticalGridActivity.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/VerticalGridActivity.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/VerticalGridActivity.java

diff --git a/prebuilts/androidtv/leanback/src/com/example/android/leanback/VerticalGridFragment.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/VerticalGridFragment.java
new file mode 100644
index 0000000..5273700
--- /dev/null
+++ b/prebuilts/androidtv/leanback/src/com/example/android/leanback/VerticalGridFragment.java

@@ -0,0 +1,93 @@
+/*
+ * 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.leanback;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Random;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v17.leanback.widget.ArrayObjectAdapter;
+import android.support.v17.leanback.widget.OnItemClickedListener;
+import android.support.v17.leanback.widget.OnItemSelectedListener;
+import android.support.v17.leanback.widget.Row;
+import android.support.v17.leanback.widget.VerticalGridPresenter;
+import android.util.Log;
+
+/*
+ * VerticalGridFragment shows a grid of videos
+ */
+public class VerticalGridFragment extends android.support.v17.leanback.app.VerticalGridFragment {
+    private static final String TAG = "VerticalGridFragment";
+
+    private static final int NUM_COLUMNS = 5;
+
+    private ArrayObjectAdapter mAdapter;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        Log.i(TAG, "onCreate");
+        super.onCreate(savedInstanceState);
+
+        setTitle(getString(R.string.vertical_grid_title));
+
+        setupFragment();
+    }
+
+    private void setupFragment() {
+        VerticalGridPresenter gridPresenter = new VerticalGridPresenter();
+        gridPresenter.setNumberOfColumns(NUM_COLUMNS);
+        setGridPresenter(gridPresenter);
+
+        mAdapter = new ArrayObjectAdapter(new CardPresenter());
+
+        long seed = System.nanoTime();
+
+        HashMap<String, List<Movie>> movies = VideoProvider.getMovieList();
+
+        for (HashMap.Entry<String, List<Movie>> entry : movies.entrySet())
+        {
+            List<Movie> list = entry.getValue();
+            Collections.shuffle(list, new Random(seed));
+            for (int j = 0; j < list.size(); j++) {
+                mAdapter.add(list.get(j));
+            }
+        }
+
+        setAdapter(mAdapter);
+
+        setOnItemSelectedListener(new OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(Object item, Row row) {
+            }
+        });
+
+        setOnItemClickedListener(new OnItemClickedListener() {
+            @Override
+            public void onItemClicked(Object item, Row row) {
+                if (item instanceof Movie) {
+                    Movie movie = (Movie) item;
+                    Intent intent = new Intent(getActivity(), DetailsActivity.class);
+                    intent.putExtra(getString(R.string.movie), movie);
+                    startActivity(intent);
+                }
+            }
+        });
+
+    }
+
+}

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/VideoItemLoader.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/VideoItemLoader.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/VideoItemLoader.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/VideoItemLoader.java

diff --git a/prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/VideoProvider.java b/prebuilts/androidtv/leanback/src/com/example/android/leanback/VideoProvider.java
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/java/com/example/android/leanback/VideoProvider.java
rename to prebuilts/androidtv/leanback/src/com/example/android/leanback/VideoProvider.java

diff --git a/prebuilts/androidtv/visual-game-controller/build.gradle b/prebuilts/androidtv/visual-game-controller/build.gradle
index 4e768db..ee65cfe 100644
--- a/prebuilts/androidtv/visual-game-controller/build.gradle
+++ b/prebuilts/androidtv/visual-game-controller/build.gradle

@@ -15,7 +15,7 @@
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "20"
+    buildToolsVersion "19"
 
     defaultConfig {
         minSdkVersion 10

diff --git a/prebuilts/androidtv/visual-game-controller/gradle/wrapper/gradle-wrapper.properties b/prebuilts/androidtv/visual-game-controller/gradle/wrapper/gradle-wrapper.properties
index 5264fcb..f4c8417 100644
--- a/prebuilts/androidtv/visual-game-controller/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/androidtv/visual-game-controller/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle
new file mode 100644
index 0000000..c029533
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/build.gradle

@@ -0,0 +1,60 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+    compile "com.android.support:appcompat-v7:18.0.+"
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..332c055
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/AndroidManifest.xml

@@ -0,0 +1,43 @@
+<?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.actionbarcompat.basic"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <!-- ActionBarCompat provides an Action Bar from API v7 onwards -->
+    <uses-sdk
+        android:minSdkVersion="7"
+        android:targetSdkVersion="17" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.AppCompat"
+        android:allowBackup="true">
+
+        <activity android:name=".MainActivity">
+            <!-- Launcher Intent filter -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/java/com/example/android/actionbarcompat/basic/MainActivity.java

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_location.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_refresh.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_action_settings.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_location.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_refresh.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_action_settings.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_location.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_action_settings.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/menu/main.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/ids.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/ids.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/ids.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/ids.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/strings.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..a2f7cfc
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.actionbarcompat.basic.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.actionbarcompat.basic"
+            android:label="Tests for com.example.android.actionbarcompat.basic" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java
rename to prebuilts/gradle/ActionBarCompat-Basic/ActionBarCompat-BasicSample/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 2e19220..0000000
--- a/prebuilts/gradle/ActionBarCompat-Basic/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,41 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.actionbarcompat.basic"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <!-- ActionBarCompat provides an Action Bar from API v7 onwards -->
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat"
-        android:allowBackup="true">
-
-        <activity android:name=".MainActivity">
-            <!-- Launcher Intent filter -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Basic/Application/tests/AndroidManifest.xml
deleted file mode 100644
index b73eb7f..0000000
--- a/prebuilts/gradle/ActionBarCompat-Basic/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.actionbarcompat.basic.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.actionbarcompat.basic"
-            android:label="Tests for com.example.android.actionbarcompat.basic" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ActionBarCompat-Basic/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/ActionBarCompat-Basic/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ActionBarCompat-Basic/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/ActionBarCompat-Basic/settings.gradle b/prebuilts/gradle/ActionBarCompat-Basic/settings.gradle
index 9464a35..21d2b41 100644
--- a/prebuilts/gradle/ActionBarCompat-Basic/settings.gradle
+++ b/prebuilts/gradle/ActionBarCompat-Basic/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'ActionBarCompat-BasicSample'

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/build.gradle b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/build.gradle
new file mode 100644
index 0000000..ffb6a3f
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/build.gradle

@@ -0,0 +1,60 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+    compile "com.android.support:appcompat-v7:+"
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..114053e
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/AndroidManifest.xml

@@ -0,0 +1,43 @@
+<?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.actionbarcompat.listpopupmenu"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <!-- ActionBarCompat provides an implementation of Popup Menu from API v7 onwards -->
+    <uses-sdk
+        android:minSdkVersion="7"
+        android:targetSdkVersion="17" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.AppCompat"
+        android:allowBackup="true">
+
+        <activity android:name=".MainActivity">
+            <!-- Launcher Intent filter -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/MainActivity.java

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_overflow.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_overflow.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/ic_overflow.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/ic_overflow.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_overflow.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_overflow.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-mdpi/ic_overflow.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-mdpi/ic_overflow.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_overflow.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_overflow.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xhdpi/ic_overflow.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xhdpi/ic_overflow.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/list_item.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/list_item.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/list_item.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/list_item.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/menu/popup.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/menu/popup.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/menu/popup.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/menu/popup.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/strings.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..d23ab10
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.actionbarcompat.listpopupmenu.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.actionbarcompat.listpopupmenu"
+            android:label="Tests for com.example.android.actionbarcompat.listpopupmenu" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java
rename to prebuilts/gradle/ActionBarCompat-ListPopupMenu/ActionBarCompat-ListPopupMenuSample/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 695d4e0..0000000
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,41 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.actionbarcompat.listpopupmenu"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <!-- ActionBarCompat provides an implementation of Popup Menu from API v7 onwards -->
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat"
-        android:allowBackup="true">
-
-        <activity android:name=".MainActivity">
-            <!-- Launcher Intent filter -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 955a51a..0000000
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.actionbarcompat.listpopupmenu.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.actionbarcompat.listpopupmenu"
-            android:label="Tests for com.example.android.actionbarcompat.listpopupmenu" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/settings.gradle b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/settings.gradle
index 9464a35..2b794b6 100644
--- a/prebuilts/gradle/ActionBarCompat-ListPopupMenu/settings.gradle
+++ b/prebuilts/gradle/ActionBarCompat-ListPopupMenu/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'ActionBarCompat-ListPopupMenuSample'

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/build.gradle b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/build.gradle
new file mode 100644
index 0000000..c029533
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/build.gradle

@@ -0,0 +1,60 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+    compile "com.android.support:appcompat-v7:18.0.+"
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..be1ed49
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/AndroidManifest.xml

@@ -0,0 +1,54 @@
+<?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.actionbarcompat.shareactionprovider"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <!--
+        ActionBarCompat provides an Action Bar from API v7 onwards
+    -->
+    <uses-sdk
+        android:minSdkVersion="7"
+        android:targetSdkVersion="17" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.AppCompat"
+        android:allowBackup="true">
+
+        <activity
+            android:name=".MainActivity">
+            <!-- Launcher Intent filter -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <!-- ContentProvider which serves files from this application's asset folder -->
+        <provider
+            android:name=".content.AssetProvider"
+            android:authorities="com.example.android.actionbarcompat.shareactionprovider"
+            android:grantUriPermissions="true"
+            android:exported="true" />
+
+    </application>
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_1.jpg b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_1.jpg
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_1.jpg
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_1.jpg
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_2.jpg b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_2.jpg
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_2.jpg
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_2.jpg
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_3.jpg b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_3.jpg
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/assets/photo_3.jpg
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/assets/photo_3.jpg
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/MainActivity.java

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/AssetProvider.java

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/java/com/example/android/actionbarcompat/shareactionprovider/content/ContentItem.java

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_image.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_image.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_image.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_image.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_text.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_text.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/item_text.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/item_text.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/menu/main_menu.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/menu/main_menu.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/menu/main_menu.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/menu/main_menu.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/strings.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..c52949c
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.actionbarcompat.shareactionprovider.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.actionbarcompat.shareactionprovider"
+            android:label="Tests for com.example.android.actionbarcompat.shareactionprovider" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java
rename to prebuilts/gradle/ActionBarCompat-ShareActionProvider/ActionBarCompat-ShareActionProviderSample/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 18dfc27..0000000
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,52 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.actionbarcompat.shareactionprovider"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <!--
-        ActionBarCompat provides an Action Bar from API v7 onwards
-    -->
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.AppCompat"
-        android:allowBackup="true">
-
-        <activity
-            android:name=".MainActivity">
-            <!-- Launcher Intent filter -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <!-- ContentProvider which serves files from this application's asset folder -->
-        <provider
-            android:name=".content.AssetProvider"
-            android:authorities="com.example.android.actionbarcompat.shareactionprovider"
-            android:grantUriPermissions="true"
-            android:exported="true" />
-
-    </application>
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/AndroidManifest.xml
deleted file mode 100644
index e750ac3..0000000
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.actionbarcompat.shareactionprovider.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.actionbarcompat.shareactionprovider"
-            android:label="Tests for com.example.android.actionbarcompat.shareactionprovider" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/settings.gradle b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/settings.gradle
index 9464a35..343656d 100644
--- a/prebuilts/gradle/ActionBarCompat-ShareActionProvider/settings.gradle
+++ b/prebuilts/gradle/ActionBarCompat-ShareActionProvider/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'ActionBarCompat-ShareActionProviderSample'

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/build.gradle b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/build.gradle
new file mode 100644
index 0000000..c029533
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/build.gradle

@@ -0,0 +1,60 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+    compile "com.android.support:appcompat-v7:18.0.+"
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..06394c7
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/AndroidManifest.xml

@@ -0,0 +1,56 @@
+<?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.actionbarcompat.styled"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="7"
+        android:targetSdkVersion="17" />
+
+    <!--
+        Theme is set on the application so that our custom theme is used by
+        default by all Activities
+    -->
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.Styled" >
+
+        <activity android:name=".MainActivity">
+
+            <!-- Launcher Intent filter -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <!--
+                In this example set the Activity to have a split action bar when the device's
+                display is narrow. In ActionBarCompat this is done by setting the
+                'android.support.UI_OPTIONS' metadata field to 'splitActionBarWhenNarrow'.
+            -->
+            <meta-data
+                android:name="android.support.UI_OPTIONS"
+                android:value="splitActionBarWhenNarrow" />
+
+        </activity>
+    </application>
+
+</manifest>

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/java/com/example/android/actionbarcompat/styled/MainActivity.java

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_bottom_solid_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_solid_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ab_stacked_solid_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_location.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_refresh.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_action_settings.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/list_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/list_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/list_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/list_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/menu_dropdown_panel_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_bg_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_bg_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_bg_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_bg_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_primary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_primary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_primary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_primary_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_secondary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_secondary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/progress_secondary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/progress_secondary_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_default_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_disabled_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/spinner_ab_pressed_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_pressed_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_selected_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_selected_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tab_unselected_pressed_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_bottom_solid_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_solid_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ab_stacked_solid_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_location.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_refresh.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_action_settings.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/list_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/list_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/list_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/list_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/menu_dropdown_panel_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_bg_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_bg_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_bg_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_bg_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_primary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_primary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_primary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_primary_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_secondary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_secondary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/progress_secondary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/progress_secondary_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_default_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_disabled_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/spinner_ab_pressed_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_pressed_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_selected_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_selected_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-mdpi/tab_unselected_pressed_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_bottom_solid_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_solid_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ab_stacked_solid_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_location.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_location.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_location.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_location.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_settings.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_settings.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_action_settings.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_action_settings.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/list_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/list_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/list_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/list_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/menu_dropdown_panel_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_bg_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_bg_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_bg_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_bg_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_primary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_primary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_primary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_primary_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/progress_secondary_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_default_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_disabled_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/spinner_ab_pressed_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_pressed_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_selected_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_selected_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_focused_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xhdpi/tab_unselected_pressed_styled.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/pressed_background.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/pressed_background.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/pressed_background.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/pressed_background.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/progress_horizontal.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/progress_horizontal.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/progress_horizontal.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/progress_horizontal.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/selectable_background.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/selectable_background.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/selectable_background.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/selectable_background.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/spinner_background_ab.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/spinner_background_ab.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/spinner_background_ab.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/spinner_background_ab.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/tab_indicator_ab.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/tab_indicator_ab.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/drawable/tab_indicator_ab.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/drawable/tab_indicator_ab.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/menu/main.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-v14/styles.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values-v14/styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/colors.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/colors.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/colors.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/strings.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/styles.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..a990607
--- /dev/null
+++ b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.actionbarcompat.styled.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.actionbarcompat.styled"
+            android:label="Tests for com.example.android.actionbarcompat.styled" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java b/prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java
rename to prebuilts/gradle/ActionBarCompat-Styled/ActionBarCompat-StyledSample/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index b9d266c..0000000
--- a/prebuilts/gradle/ActionBarCompat-Styled/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,54 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.actionbarcompat.styled"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <!--
-        Theme is set on the application so that our custom theme is used by
-        default by all Activities
-    -->
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.Styled" >
-
-        <activity android:name=".MainActivity">
-
-            <!-- Launcher Intent filter -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-            <!--
-                In this example set the Activity to have a split action bar when the device's
-                display is narrow. In ActionBarCompat this is done by setting the
-                'android.support.UI_OPTIONS' metadata field to 'splitActionBarWhenNarrow'.
-            -->
-            <meta-data
-                android:name="android.support.UI_OPTIONS"
-                android:value="splitActionBarWhenNarrow" />
-
-        </activity>
-    </application>
-
-</manifest>

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/Application/tests/AndroidManifest.xml b/prebuilts/gradle/ActionBarCompat-Styled/Application/tests/AndroidManifest.xml
deleted file mode 100644
index bf2fab4..0000000
--- a/prebuilts/gradle/ActionBarCompat-Styled/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.actionbarcompat.styled.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.actionbarcompat.styled"
-            android:label="Tests for com.example.android.actionbarcompat.styled" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ActionBarCompat-Styled/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/ActionBarCompat-Styled/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ActionBarCompat-Styled/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/ActionBarCompat-Styled/settings.gradle b/prebuilts/gradle/ActionBarCompat-Styled/settings.gradle
index 9464a35..eb7d66b 100644
--- a/prebuilts/gradle/ActionBarCompat-Styled/settings.gradle
+++ b/prebuilts/gradle/ActionBarCompat-Styled/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'ActionBarCompat-StyledSample'

diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/ActivityInstrumentation/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/activityinstrumentation/MainActivity.java b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/activityinstrumentation/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/activityinstrumentation/MainActivity.java
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/activityinstrumentation/MainActivity.java

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-sw720dp-land/dimens.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/strings.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/tests/AndroidManifest.xml b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..ad20a2a
--- /dev/null
+++ b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.activityinstrumentation.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.activityinstrumentation"
+            android:label="Tests for com.example.android.activityinstrumentation" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/tests/src/com/example/android/activityinstrumentation/SampleTests.java b/prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/tests/src/com/example/android/activityinstrumentation/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ActivityInstrumentation/Application/tests/src/com/example/android/activityinstrumentation/SampleTests.java
rename to prebuilts/gradle/ActivityInstrumentation/ActivityInstrumentationSample/tests/src/com/example/android/activityinstrumentation/SampleTests.java

diff --git a/prebuilts/gradle/ActivityInstrumentation/Application/build.gradle b/prebuilts/gradle/ActivityInstrumentation/Application/build.gradle
deleted file mode 100644
index 85e2282..0000000
--- a/prebuilts/gradle/ActivityInstrumentation/Application/build.gradle
+++ /dev/null

@@ -1,68 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-repositories {
-    jcenter()
-}
-
-
-dependencies {
-
-    compile "com.android.support:support-v4:21.+"
-
-}
-
-// 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.0.0"
-
-    defaultConfig {
-        minSdkVersion 4
-        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/ActivityInstrumentation/Application/tests/AndroidManifest.xml b/prebuilts/gradle/ActivityInstrumentation/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 4c24a6f..0000000
--- a/prebuilts/gradle/ActivityInstrumentation/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.activityinstrumentation.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.activityinstrumentation"
-            android:label="Tests for com.example.android.activityinstrumentation" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ActivityInstrumentation/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ActivityInstrumentation/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/ActivityInstrumentation/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ActivityInstrumentation/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/ActivityInstrumentation/settings.gradle b/prebuilts/gradle/ActivityInstrumentation/settings.gradle
index 9464a35..0f010ba 100644
--- a/prebuilts/gradle/ActivityInstrumentation/settings.gradle
+++ b/prebuilts/gradle/ActivityInstrumentation/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'ActivityInstrumentationSample'

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/build.gradle b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/build.gradle
new file mode 100644
index 0000000..b45f201
--- /dev/null
+++ b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/build.gradle

@@ -0,0 +1,67 @@
+
+
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+repositories {
+    jcenter()
+}
+
+
+dependencies {
+
+
+
+    compile files('libs/volley.jar')
+}
+
+// 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 "android-L"
+
+    buildToolsVersion "19.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/ActivitySceneTransitionBasic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/Item.java b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/Item.java
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/Item.java
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/Item.java

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/activityscenetransitionbasic/SquareFrameLayout.java

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/layout/details.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/details.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/layout/details.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/details.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/layout/grid.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/grid.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/layout/grid.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/grid.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/layout/grid_item.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/grid_item.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/layout/grid_item.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/layout/grid_item.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/transition/grid_detail_transition.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/transition/grid_detail_transition.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/transition/grid_detail_transition.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/transition/grid_detail_transition.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values-v21/styles.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values-v21/styles.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values-v21/styles.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values-v21/styles.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/base-strings.xml
new file mode 100644
index 0000000..391c2d6
--- /dev/null
+++ b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/base-strings.xml

@@ -0,0 +1,34 @@
+<?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">ActivitySceneTransitionBasic</string>
+    <string name="intro_message">
+        <![CDATA[
+        
+            
+            Demonstrates how to the use Activity scene transitions when transitions
+            from one Activity to another. Uses a combination of moveImage and changeBounds
+            to nicely transition a grid of images to an Activity with a large image and detail
+            text.
+            
+        
+        ]]>
+    </string>
+</resources>

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values/strings.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/tests/AndroidManifest.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..99605ee
--- /dev/null
+++ b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.
+  -->
+<!-- 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.activityscenetransitionbasic.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.activityscenetransitionbasic"
+            android:label="Tests for com.example.android.activityscenetransitionbasic" />
+
+</manifest>

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java b/prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ActivitySceneTransitionBasic/Application/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java
rename to prebuilts/gradle/ActivitySceneTransitionBasic/ActivitySceneTransitionBasicSample/tests/src/com/example/android/activityscenetransitionbasic/tests/SampleTests.java

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 989fe00..0000000
--- a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,31 +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">ActivitySceneTransitionBasic</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            Demonstrates how to the use Activity scene transitions when transitions
-            from one Activity to another. Uses a combination of moveImage and changeBounds
-            to nicely transition a grid of images to an Activity with a large image and detail
-            text.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/ActivitySceneTransitionBasic/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 65521e6..0000000
--- a/prebuilts/gradle/ActivitySceneTransitionBasic/Application/tests/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.
-  -->
-<!-- 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.activityscenetransitionbasic.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.activityscenetransitionbasic"
-            android:label="Tests for com.example.android.activityscenetransitionbasic" />
-
-</manifest>

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/CONTRIB.md b/prebuilts/gradle/ActivitySceneTransitionBasic/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/ActivitySceneTransitionBasic/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/ActivitySceneTransitionBasic/LICENSE b/prebuilts/gradle/ActivitySceneTransitionBasic/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/ActivitySceneTransitionBasic/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/ActivitySceneTransitionBasic/README.md b/prebuilts/gradle/ActivitySceneTransitionBasic/README.md
deleted file mode 100644
index afb91ce..0000000
--- a/prebuilts/gradle/ActivitySceneTransitionBasic/README.md
+++ /dev/null

@@ -1,51 +0,0 @@
-Android ActivitySceneTransitionBasic Sample
-==============================
-
-Demonstrates how to the use Activity scene transitions when transitions
-from one Activity to another. Uses a combination of moveImage and changeBounds
-to nicely transition a grid of images to an Activity with a large image and detail text.
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-ActivitySceneTransitionBasic
-
-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/ActivitySceneTransitionBasic/README.txt b/prebuilts/gradle/ActivitySceneTransitionBasic/README.txt
new file mode 100644
index 0000000..9616c58
--- /dev/null
+++ b/prebuilts/gradle/ActivitySceneTransitionBasic/README.txt

@@ -0,0 +1,18 @@
+Build Instructions
+-------------------
+
+This sample uses the Gradle build system. To build this project, use the
+"gradlew build" command or use "Import Project" in Android Studio.
+
+To see a list of all available commands, run "gradlew tasks".
+
+Dependencies
+-------------
+
+- Android SDK Build-tools v18.1
+- Android Support Repository v2
+
+Dependencies are available for download via the Android SDK Manager.
+
+Android Studio is available for download at:
+    http://developer.android.com/sdk/installing/studio.html

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/packaging.yaml b/prebuilts/gradle/ActivitySceneTransitionBasic/packaging.yaml
deleted file mode 100644
index 0d1188d..0000000
--- a/prebuilts/gradle/ActivitySceneTransitionBasic/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-ActivitySceneTransitionBasic
-level:        BEGINNER
-icon:         ActivitySceneTransitionBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2

diff --git a/prebuilts/gradle/ActivitySceneTransitionBasic/settings.gradle b/prebuilts/gradle/ActivitySceneTransitionBasic/settings.gradle
index 9464a35..363009d 100644
--- a/prebuilts/gradle/ActivitySceneTransitionBasic/settings.gradle
+++ b/prebuilts/gradle/ActivitySceneTransitionBasic/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'ActivitySceneTransitionBasicSample'

diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/AdapterTransition/AdapterTransitionSample/src/main/AndroidManifest.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..01b414d
--- /dev/null
+++ b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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">
+
+    <uses-sdk
+        android:minSdkVersion="19"
+        android:targetSdkVersion="19"/>
+
+    <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/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/AdapterTransitionFragment.java

diff --git a/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MainActivity.java b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MainActivity.java
new file mode 100644
index 0000000..cfe52e1
--- /dev/null
+++ b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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);
+
+        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/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/Meat.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/Meat.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/Meat.java

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MeatAdapter.java b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MeatAdapter.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/adaptertransition/MeatAdapter.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/adaptertransition/MeatAdapter.java

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_grid.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_grid.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_grid.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_list.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_action_list.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_action_list.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/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/AdapterTransition/AdapterTransitionSample/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/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_grid.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_grid.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_grid.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_list.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_action_list.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_action_list.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p1.jpg b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p1.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p1.jpg
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p1.jpg
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p10.jpg b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p10.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p10.jpg
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p10.jpg
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p11.jpg b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p11.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p11.jpg
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p11.jpg
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p2.jpg b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p2.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p2.jpg
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p2.jpg
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p3.jpg b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p3.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p3.jpg
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p3.jpg
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p4.jpg b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p4.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p4.jpg
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p4.jpg
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p5.jpg b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p5.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p5.jpg
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p5.jpg
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p6.jpg b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p6.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p6.jpg
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p6.jpg
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p7.jpg b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p7.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p7.jpg
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p7.jpg
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p8.jpg b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p8.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p8.jpg
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p8.jpg
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p9.jpg b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p9.jpg
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-nodpi/p9.jpg
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-nodpi/p9.jpg
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_grid.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_grid.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_grid.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_list.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_action_list.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_action_list.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_grid.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_grid.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_grid.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_grid.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_list.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_list.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_action_list.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_action_list.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_adapter_transition.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_adapter_transition.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_adapter_transition.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_adapter_transition.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_grid.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_grid.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_grid.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_grid.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_list.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_list.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/fragment_meat_list.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/fragment_meat_list.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_grid.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_grid.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_grid.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_grid.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_list.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_list.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/layout/item_meat_list.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/layout/item_meat_list.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/menu/fragment_adapter_transition.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/menu/fragment_adapter_transition.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/menu/fragment_adapter_transition.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/menu/fragment_adapter_transition.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/menu/main.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/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/AdapterTransition/AdapterTransitionSample/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/AdapterTransition/AdapterTransitionSample/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/AdapterTransition/AdapterTransitionSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/strings.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/AdapterTransition/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AdapterTransition/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/AdapterTransition/AdapterTransitionSample/src/main/res/values/template-styles.xml

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/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/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/AdapterTransition/gradle/wrapper/gradle-wrapper.properties
index 00daa77..4f5d419 100644
--- a/prebuilts/gradle/AdapterTransition/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/AdapterTransition/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/AdapterTransition/settings.gradle b/prebuilts/gradle/AdapterTransition/settings.gradle
index 9464a35..3284a23 100644
--- a/prebuilts/gradle/AdapterTransition/settings.gradle
+++ b/prebuilts/gradle/AdapterTransition/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'AdapterTransitionSample'

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/AdvancedImmersiveMode/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/AdvancedImmersiveModeFragment.java

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/MainActivity.java b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/MainActivity.java
new file mode 100644
index 0000000..b229868
--- /dev/null
+++ b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/advancedimmersivemode/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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.advancedimmersivemode;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        AdvancedImmersiveModeFragment fragment = new AdvancedImmersiveModeFragment();
+        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/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout/fragment_flags.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/layout/fragment_flags.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/layout/fragment_flags.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/menu/main.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/AndroidManifest.xml b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..7117969
--- /dev/null
+++ b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.advancedimmersivemode.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="19"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.advancedimmersivemode"
+            android:label="Tests for com.example.android.advancedimmersivemode" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java b/prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/AdvancedImmersiveMode/Application/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java
rename to prebuilts/gradle/AdvancedImmersiveMode/AdvancedImmersiveModeSample/tests/src/com/example/android/advancedimmersivemode/tests/SampleTests.java

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/Application/build.gradle b/prebuilts/gradle/AdvancedImmersiveMode/Application/build.gradle
deleted file mode 100644
index 85e2282..0000000
--- a/prebuilts/gradle/AdvancedImmersiveMode/Application/build.gradle
+++ /dev/null

@@ -1,68 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-repositories {
-    jcenter()
-}
-
-
-dependencies {
-
-    compile "com.android.support:support-v4:21.+"
-
-}
-
-// 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.0.0"
-
-    defaultConfig {
-        minSdkVersion 4
-        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/AdvancedImmersiveMode/Application/src/main/java/com/example/android/advancedimmersivemode/MainActivity.java b/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/advancedimmersivemode/MainActivity.java
deleted file mode 100644
index 4fc40af..0000000
--- a/prebuilts/gradle/AdvancedImmersiveMode/Application/src/main/java/com/example/android/advancedimmersivemode/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.advancedimmersivemode;
-
-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();
-            AdvancedImmersiveModeFragment fragment = new AdvancedImmersiveModeFragment();
-            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/AdvancedImmersiveMode/Application/tests/AndroidManifest.xml b/prebuilts/gradle/AdvancedImmersiveMode/Application/tests/AndroidManifest.xml
deleted file mode 100644
index bb8c97e..0000000
--- a/prebuilts/gradle/AdvancedImmersiveMode/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.advancedimmersivemode.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.advancedimmersivemode"
-            android:label="Tests for com.example.android.advancedimmersivemode" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/AdvancedImmersiveMode/gradle/wrapper/gradle-wrapper.properties
index 7817462..9e133a0 100644
--- a/prebuilts/gradle/AdvancedImmersiveMode/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/AdvancedImmersiveMode/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip

diff --git a/prebuilts/gradle/AdvancedImmersiveMode/settings.gradle b/prebuilts/gradle/AdvancedImmersiveMode/settings.gradle
index 9464a35..0f7ed4b 100644
--- a/prebuilts/gradle/AdvancedImmersiveMode/settings.gradle
+++ b/prebuilts/gradle/AdvancedImmersiveMode/settings.gradle

@@ -1 +1 @@
-include 'Application'
+include 'AdvancedImmersiveModeSample'

diff --git a/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/AppRestrictions/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsActivity.java

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/CustomRestrictionsFragment.java

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/GetRestrictionsReceiver.java

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/MainActivity.java b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/java/com/example/android/apprestrictions/MainActivity.java
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/java/com/example/android/apprestrictions/MainActivity.java

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/layout/main.xml b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/layout/main.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/layout/main.xml
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/layout/main.xml

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/values/strings.xml b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/AppRestrictions/Application/src/main/res/xml/custom_prefs.xml b/prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/xml/custom_prefs.xml
similarity index 100%
rename from prebuilts/gradle/AppRestrictions/Application/src/main/res/xml/custom_prefs.xml
rename to prebuilts/gradle/AppRestrictions/AppRestrictionsSample/src/main/res/xml/custom_prefs.xml

diff --git a/prebuilts/gradle/AppRestrictions/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/AppRestrictions/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/AppRestrictions/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/AppRestrictions/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/AppRestrictions/settings.gradle b/prebuilts/gradle/AppRestrictions/settings.gradle
index 9464a35..02aef49 100644
--- a/prebuilts/gradle/AppRestrictions/settings.gradle
+++ b/prebuilts/gradle/AppRestrictions/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'AppRestrictionsSample'

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicAccessibility/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 281114d..0000000
--- a/prebuilts/gradle/BasicAccessibility/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,42 +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.
--->
-
-
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.basicaccessibility"
-    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=".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/BasicAccessibility/Application/tests/AndroidManifest.xml b/prebuilts/gradle/BasicAccessibility/Application/tests/AndroidManifest.xml
deleted file mode 100644
index e7c7840..0000000
--- a/prebuilts/gradle/BasicAccessibility/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.basicaccessibility.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.basicaccessibility"
-            android:label="Tests for com.example.android.basicaccessibility" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/build.gradle b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicAccessibility/BasicAccessibilitySample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..d61d789
--- /dev/null
+++ b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/AndroidManifest.xml

@@ -0,0 +1,44 @@
+<?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.basicaccessibility"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-sdk
+        android:minSdkVersion="11"
+        android:targetSdkVersion="16" />
+
+    <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>
+    </application>
+
+</manifest>

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/DialView.java b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/DialView.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/DialView.java
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/DialView.java

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/MainActivity.java b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/basicaccessibility/MainActivity.java
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/basicaccessibility/MainActivity.java

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_discard.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_discard.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_discard.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_discard.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_info.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_action_info.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_action_info.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/partly_cloudy.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/partly_cloudy.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/partly_cloudy.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/partly_cloudy.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_discard.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_discard.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_discard.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_discard.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_info.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_action_info.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_action_info.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_discard.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_discard.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_discard.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_discard.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_info.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_action_info.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_action_info.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-sw720dp-land/dimens.xml

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..8dc47be
--- /dev/null
+++ b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.basicaccessibility.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.basicaccessibility"
+            android:label="Tests for com.example.android.basicaccessibility" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java b/prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicAccessibility/Application/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java
rename to prebuilts/gradle/BasicAccessibility/BasicAccessibilitySample/tests/src/com/example/android/basicaccessibility/tests/SampleTests.java

diff --git a/prebuilts/gradle/BasicAccessibility/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicAccessibility/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicAccessibility/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicAccessibility/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicAccessibility/settings.gradle b/prebuilts/gradle/BasicAccessibility/settings.gradle
index 9464a35..7900b3d 100644
--- a/prebuilts/gradle/BasicAccessibility/settings.gradle
+++ b/prebuilts/gradle/BasicAccessibility/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicAccessibilitySample'

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/tests/AndroidManifest.xml b/prebuilts/gradle/BasicAndroidKeyStore/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 3ebff98..0000000
--- a/prebuilts/gradle/BasicAndroidKeyStore/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.basicandroidkeystore.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.basicandroidkeystore"
-            android:label="Tests for com.example.android.basicandroidkeystore" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/build.gradle b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicAndroidKeyStore/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/BasicAndroidKeyStoreFragment.java

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/MainActivity.java b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/MainActivity.java
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/MainActivity.java

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/basicandroidkeystore/SecurityConstants.java

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout-sw600dp-land/activity_main.xml

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout-sw600dp/activity_main.xml

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/menu/main.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..eb8b7b8
--- /dev/null
+++ b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.basicandroidkeystore.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.basicandroidkeystore"
+            android:label="Tests for com.example.android.basicandroidkeystore" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/Application/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java b/prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicAndroidKeyStore/Application/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java
rename to prebuilts/gradle/BasicAndroidKeyStore/BasicAndroidKeyStoreSample/tests/src/com/example/android/basicandroidkeystore/tests/SampleTests.java

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicAndroidKeyStore/settings.gradle b/prebuilts/gradle/BasicAndroidKeyStore/settings.gradle
index 9464a35..e4b36fe 100644
--- a/prebuilts/gradle/BasicAndroidKeyStore/settings.gradle
+++ b/prebuilts/gradle/BasicAndroidKeyStore/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicAndroidKeyStoreSample'

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicContactables/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 079db23..0000000
--- a/prebuilts/gradle/BasicContactables/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,50 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.basiccontactables"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <!-- BEGIN_INCLUDE(contacts_permission) -->
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
-    <!-- END_INCLUDE(contacts_permission) -->
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-    <permission android:name="android"></permission>
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/Theme.Sample" >
-        <activity
-            android:name="com.example.android.basiccontactables.MainActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop">
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <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/BasicContactables/Application/tests/AndroidManifest.xml b/prebuilts/gradle/BasicContactables/Application/tests/AndroidManifest.xml
deleted file mode 100644
index f8326f0..0000000
--- a/prebuilts/gradle/BasicContactables/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.basiccontactables.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.basiccontactables"
-            android:label="Tests for com.example.android.basiccontactables" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/build.gradle b/prebuilts/gradle/BasicContactables/BasicContactablesSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicContactables/BasicContactablesSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicContactables/BasicContactablesSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..62b9812
--- /dev/null
+++ b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/AndroidManifest.xml

@@ -0,0 +1,52 @@
+<?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.basiccontactables"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <!-- BEGIN_INCLUDE(contacts_permission) -->
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <!-- END_INCLUDE(contacts_permission) -->
+    <uses-sdk
+        android:minSdkVersion="18"
+        android:targetSdkVersion="18" />
+    <permission android:name="android"></permission>
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.Sample" >
+        <activity
+            android:name="com.example.android.basiccontactables.MainActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTop">
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+            <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/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/ContactablesLoaderCallbacks.java

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/MainActivity.java b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/basiccontactables/MainActivity.java
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/basiccontactables/MainActivity.java

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/ic_search_api_holo_light.png b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_search_api_holo_light.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/ic_search_api_holo_light.png
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/ic_search_api_holo_light.png
Binary files differ

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-mdpi/ic_search_api_holo_light.png b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_search_api_holo_light.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-mdpi/ic_search_api_holo_light.png
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-mdpi/ic_search_api_holo_light.png
Binary files differ

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xhdpi/ic_search_api_holo_light.png
Binary files differ

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/menu/main.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/values/styles.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicContactables/Application/src/main/res/xml/searchable.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/xml/searchable.xml
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/src/main/res/xml/searchable.xml
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/src/main/res/xml/searchable.xml

diff --git a/prebuilts/gradle/BasicContactables/BasicContactablesSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicContactables/BasicContactablesSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..8c4af25
--- /dev/null
+++ b/prebuilts/gradle/BasicContactables/BasicContactablesSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.basiccontactables.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.basiccontactables"
+            android:label="Tests for com.example.android.basiccontactables" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicContactables/Application/tests/src/com/example/android/basiccontactables/tests/SampleTests.java b/prebuilts/gradle/BasicContactables/BasicContactablesSample/tests/src/com/example/android/basiccontactables/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicContactables/Application/tests/src/com/example/android/basiccontactables/tests/SampleTests.java
rename to prebuilts/gradle/BasicContactables/BasicContactablesSample/tests/src/com/example/android/basiccontactables/tests/SampleTests.java

diff --git a/prebuilts/gradle/BasicContactables/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicContactables/gradle/wrapper/gradle-wrapper.properties
index 96bdeaf..7268f8e 100644
--- a/prebuilts/gradle/BasicContactables/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicContactables/gradle/wrapper/gradle-wrapper.properties

@@ -4,4 +4,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicContactables/settings.gradle b/prebuilts/gradle/BasicContactables/settings.gradle
index 9464a35..5fec49c 100644
--- a/prebuilts/gradle/BasicContactables/settings.gradle
+++ b/prebuilts/gradle/BasicContactables/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicContactablesSample'

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/tests/AndroidManifest.xml b/prebuilts/gradle/BasicGestureDetect/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 7014df0..0000000
--- a/prebuilts/gradle/BasicGestureDetect/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.basicgesturedetect.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.basicgesturedetect"
-            android:label="Tests for com.example.android.basicgesturedetect" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/build.gradle b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicGestureDetect/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/BasicGestureDetectFragment.java

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/GestureListener.java b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/GestureListener.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/GestureListener.java
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/GestureListener.java

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/MainActivity.java b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/basicgesturedetect/MainActivity.java
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/basicgesturedetect/MainActivity.java

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout-sw600dp-land/activity_main.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout-sw600dp/activity_main.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/menu/main.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..3c5487c
--- /dev/null
+++ b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.basicgesturedetect.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.basicgesturedetect"
+            android:label="Tests for com.example.android.basicgesturedetect" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicGestureDetect/Application/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java b/prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicGestureDetect/Application/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java
rename to prebuilts/gradle/BasicGestureDetect/BasicGestureDetectSample/tests/src/com/example/android/basicgesturedetect/tests/SampleTests.java

diff --git a/prebuilts/gradle/BasicGestureDetect/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicGestureDetect/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicGestureDetect/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicGestureDetect/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicGestureDetect/settings.gradle b/prebuilts/gradle/BasicGestureDetect/settings.gradle
index 9464a35..ba7e8c0 100644
--- a/prebuilts/gradle/BasicGestureDetect/settings.gradle
+++ b/prebuilts/gradle/BasicGestureDetect/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicGestureDetectSample'

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/tests/AndroidManifest.xml b/prebuilts/gradle/BasicImmersiveMode/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 844c34d..0000000
--- a/prebuilts/gradle/BasicImmersiveMode/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.basicimmersivemode.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.basicimmersivemode"
-            android:label="Tests for com.example.android.basicimmersivemode" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/build.gradle b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicImmersiveMode/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/BasicImmersiveModeFragment.java

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/MainActivity.java b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/basicimmersivemode/MainActivity.java
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/basicimmersivemode/MainActivity.java

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout-sw600dp-land/activity_main.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout-sw600dp/activity_main.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/menu/main.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..070368c
--- /dev/null
+++ b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.basicimmersivemode.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="19"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.basicimmersivemode"
+            android:label="Tests for com.example.android.basicimmersivemode" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicImmersiveMode/Application/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java b/prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicImmersiveMode/Application/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java
rename to prebuilts/gradle/BasicImmersiveMode/BasicImmersiveModeSample/tests/src/com/example/android/basicimmersivemode/tests/SampleTests.java

diff --git a/prebuilts/gradle/BasicImmersiveMode/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicImmersiveMode/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicImmersiveMode/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicImmersiveMode/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicImmersiveMode/settings.gradle b/prebuilts/gradle/BasicImmersiveMode/settings.gradle
index 9464a35..8dda383 100644
--- a/prebuilts/gradle/BasicImmersiveMode/settings.gradle
+++ b/prebuilts/gradle/BasicImmersiveMode/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicImmersiveModeSample'

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java b/prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java
deleted file mode 100644
index beb8d4a..0000000
--- a/prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java
+++ /dev/null

@@ -1,383 +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.basicmanagedprofile;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.app.admin.DevicePolicyManager;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CompoundButton;
-import android.widget.ScrollView;
-import android.widget.Switch;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import static android.app.admin.DevicePolicyManager.FLAG_MANAGED_CAN_ACCESS_PARENT;
-import static android.app.admin.DevicePolicyManager.FLAG_PARENT_CAN_ACCESS_MANAGED;
-
-/**
- * Provides several functions that are available in a managed profile. This includes
- * enabling/disabling other apps, setting app restrictions, enabling/disabling intent forwarding,
- * and wiping out all the data in the profile.
- */
-public class BasicManagedProfileFragment extends Fragment
-        implements View.OnClickListener,
-        CompoundButton.OnCheckedChangeListener {
-
-    /**
-     * Tag for logging.
-     */
-    private static final String TAG = "BasicManagedProfileFragment";
-
-    /**
-     * Package name of calculator
-     */
-    private static final String PACKAGE_NAME_CALCULATOR = "com.android.calculator2";
-
-    /**
-     * Package name of Chrome
-     */
-    private static final String PACKAGE_NAME_CHROME = "com.android.chrome";
-
-    /**
-     * {@link Button} to remove this managed profile.
-     */
-    private Button mButtonRemoveProfile;
-
-    /**
-     * Whether the calculator app is enabled in this profile
-     */
-    private boolean mCalculatorEnabled;
-
-    /**
-     * Whether Chrome is enabled in this profile
-     */
-    private boolean mChromeEnabled;
-
-    public BasicManagedProfileFragment() {
-    }
-
-    public static BasicManagedProfileFragment newInstance() {
-        return new BasicManagedProfileFragment();
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_main, container, false);
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        // Retrieves whether the calculator app is enabled in this profile
-        mCalculatorEnabled = isApplicationEnabled(PACKAGE_NAME_CALCULATOR);
-        // Retrieves whether Chrome is enabled in this profile
-        mChromeEnabled = isApplicationEnabled(PACKAGE_NAME_CHROME);
-    }
-
-    /**
-     * Checks if the application is available in this profile.
-     *
-     * @param packageName The package name
-     * @return True if the application is available in this profile.
-     */
-    private boolean isApplicationEnabled(String packageName) {
-        Activity activity = getActivity();
-        PackageManager packageManager = activity.getPackageManager();
-        try {
-            ApplicationInfo applicationInfo = packageManager.getApplicationInfo(
-                    packageName, PackageManager.GET_UNINSTALLED_PACKAGES);
-            // Return false if the app is not installed in this profile
-            if (0 == (applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)) {
-                return false;
-            }
-            // Check if the app is not hidden in this profile
-            DevicePolicyManager devicePolicyManager =
-                    (DevicePolicyManager) activity.getSystemService(Activity.DEVICE_POLICY_SERVICE);
-            return !devicePolicyManager.isApplicationHidden(
-                    BasicDeviceAdminReceiver.getComponentName(activity), packageName);
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        // Bind event listeners and initial states
-        view.findViewById(R.id.set_chrome_restrictions).setOnClickListener(this);
-        view.findViewById(R.id.clear_chrome_restrictions).setOnClickListener(this);
-        view.findViewById(R.id.enable_forwarding).setOnClickListener(this);
-        view.findViewById(R.id.disable_forwarding).setOnClickListener(this);
-        view.findViewById(R.id.send_intent).setOnClickListener(this);
-        mButtonRemoveProfile = (Button) view.findViewById(R.id.remove_profile);
-        mButtonRemoveProfile.setOnClickListener(this);
-        Switch toggleCalculator = (Switch) view.findViewById(R.id.toggle_calculator);
-        toggleCalculator.setChecked(mCalculatorEnabled);
-        toggleCalculator.setOnCheckedChangeListener(this);
-        Switch toggleChrome = (Switch) view.findViewById(R.id.toggle_chrome);
-        toggleChrome.setChecked(mChromeEnabled);
-        toggleChrome.setOnCheckedChangeListener(this);
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.set_chrome_restrictions: {
-                setChromeRestrictions();
-                break;
-            }
-            case R.id.clear_chrome_restrictions: {
-                clearChromeRestrictions();
-                break;
-            }
-            case R.id.enable_forwarding: {
-                enableForwarding();
-                break;
-            }
-            case R.id.disable_forwarding: {
-                disableForwarding();
-                break;
-            }
-            case R.id.send_intent: {
-                sendIntent();
-                break;
-            }
-            case R.id.remove_profile: {
-                mButtonRemoveProfile.setEnabled(false);
-                removeProfile();
-                break;
-            }
-        }
-    }
-
-    @Override
-    public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-        switch (compoundButton.getId()) {
-            case R.id.toggle_calculator: {
-                setAppEnabled(PACKAGE_NAME_CALCULATOR, checked);
-                mCalculatorEnabled = checked;
-                break;
-            }
-            case R.id.toggle_chrome: {
-                setAppEnabled(PACKAGE_NAME_CHROME, checked);
-                mChromeEnabled = checked;
-                break;
-            }
-        }
-    }
-
-    /**
-     * Enables or disables the specified app in this profile.
-     *
-     * @param packageName The package name of the target app.
-     * @param enabled     Pass true to enable the app.
-     */
-    private void setAppEnabled(String packageName, boolean enabled) {
-        Activity activity = getActivity();
-        if (null == activity) {
-            return;
-        }
-        PackageManager packageManager = activity.getPackageManager();
-        DevicePolicyManager devicePolicyManager =
-                (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        try {
-            ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName,
-                    PackageManager.GET_UNINSTALLED_PACKAGES);
-            // Here, we check the ApplicationInfo of the target app, and see if the flags have
-            // ApplicationInfo.FLAG_INSTALLED turned on using bitwise operation.
-            if (0 == (applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED)) {
-                // If the app is not installed in this profile, we can enable it by
-                // DPM.enableSystemApp
-                if (enabled) {
-                    devicePolicyManager.enableSystemApp(
-                            BasicDeviceAdminReceiver.getComponentName(activity), packageName);
-                } else {
-                    // But we cannot disable the app since it is already disabled
-                    Log.e(TAG, "Cannot disable this app: " + packageName);
-                    return;
-                }
-            } else {
-                // If the app is already installed, we can enable or disable it by
-                // DPM.setApplicationHidden
-                devicePolicyManager.setApplicationHidden(
-                        BasicDeviceAdminReceiver.getComponentName(activity), packageName, !enabled);
-            }
-            Toast.makeText(activity, enabled ? R.string.enabled : R.string.disabled,
-                    Toast.LENGTH_SHORT).show();
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(TAG, "The app cannot be found: " + packageName, e);
-        }
-    }
-
-    /**
-     * Sets restrictions to Chrome
-     */
-    private void setChromeRestrictions() {
-        final Activity activity = getActivity();
-        if (null == activity) {
-            return;
-        }
-        final DevicePolicyManager manager =
-            (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        final Bundle settings = new Bundle();
-        settings.putString("EditBookmarksEnabled", "false");
-        settings.putString("IncognitoModeAvailability", "1");
-        settings.putString("ManagedBookmarks",
-                           "[{\"name\": \"Chromium\", \"url\": \"http://chromium.org\"}, " +
-                           "{\"name\": \"Google\", \"url\": \"https://www.google.com\"}]");
-        settings.putString("DefaultSearchProviderEnabled", "true");
-        settings.putString("DefaultSearchProviderName", "\"LMGTFY\"");
-        settings.putString("DefaultSearchProviderSearchURL",
-                "\"http://lmgtfy.com/?q={searchTerms}\"");
-        settings.putString("URLBlacklist", "[\"example.com\", \"example.org\"]");
-        StringBuilder message = new StringBuilder("Setting Chrome restrictions:");
-        for (String key : settings.keySet()) {
-            message.append("\n");
-            message.append(key);
-            message.append(": ");
-            message.append(settings.getString(key));
-        }
-        ScrollView view = new ScrollView(activity);
-        TextView text = new TextView(activity);
-        text.setText(message);
-        int size = (int) activity.getResources().getDimension(R.dimen.activity_horizontal_margin);
-        view.setPadding(size, size, size, size);
-        view.addView(text);
-        new AlertDialog.Builder(activity)
-                .setView(view)
-                .setNegativeButton(android.R.string.cancel, null)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int i) {
-                        // This is how you can set restrictions to an app.
-                        // The format for settings in Bundle differs from app to app.
-                        manager.setApplicationRestrictions
-                                (BasicDeviceAdminReceiver.getComponentName(activity),
-                                        PACKAGE_NAME_CHROME, settings);
-                        Toast.makeText(activity, R.string.restrictions_set,
-                                Toast.LENGTH_SHORT).show();
-                    }
-                })
-                .show();
-    }
-
-    /**
-     * Clears restrictions to Chrome
-     */
-    private void clearChromeRestrictions() {
-        final Activity activity = getActivity();
-        if (null == activity) {
-            return;
-        }
-        final DevicePolicyManager manager =
-                (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        // In order to clear restrictions, pass null as the restriction Bundle for
-        // setApplicationRestrictions
-        manager.setApplicationRestrictions
-                (BasicDeviceAdminReceiver.getComponentName(activity),
-                        PACKAGE_NAME_CHROME, null);
-        Toast.makeText(activity, R.string.cleared, Toast.LENGTH_SHORT).show();
-    }
-
-    /**
-     * Enables forwarding of share intent between private account and managed profile.
-     */
-    private void enableForwarding() {
-        Activity activity = getActivity();
-        if (null == activity || activity.isFinishing()) {
-            return;
-        }
-        DevicePolicyManager manager =
-                (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        try {
-            IntentFilter filter = new IntentFilter(Intent.ACTION_SEND);
-            filter.addDataType("text/plain");
-            filter.addDataType("image/jpeg");
-            // This is how you can register an IntentFilter as allowed pattern of Intent forwarding
-            manager.addCrossProfileIntentFilter(BasicDeviceAdminReceiver.getComponentName(activity),
-                    filter, FLAG_MANAGED_CAN_ACCESS_PARENT | FLAG_PARENT_CAN_ACCESS_MANAGED);
-        } catch (IntentFilter.MalformedMimeTypeException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Disables forwarding of all intents.
-     */
-    private void disableForwarding() {
-        Activity activity = getActivity();
-        if (null == activity || activity.isFinishing()) {
-            return;
-        }
-        DevicePolicyManager manager =
-                (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        manager.clearCrossProfileIntentFilters(BasicDeviceAdminReceiver.getComponentName(activity));
-    }
-
-    /**
-     * Sends a sample intent of a plain text message.  This is just a utility function to see how
-     * the intent forwarding works.
-     */
-    private void sendIntent() {
-        Activity activity = getActivity();
-        if (null == activity || activity.isFinishing()) {
-            return;
-        }
-        DevicePolicyManager manager =
-                (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        Intent intent = new Intent(Intent.ACTION_SEND);
-        intent.setType("text/plain");
-        intent.putExtra(Intent.EXTRA_TEXT,
-                manager.isProfileOwnerApp(activity.getApplicationContext().getPackageName())
-                        ? "From the managed account" : "From the primary account");
-        try {
-            startActivity(intent);
-            Log.d(TAG, "A sample intent was sent.");
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(activity, R.string.activity_not_found, Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    /**
-     * Wipes out all the data related to this managed profile.
-     */
-    private void removeProfile() {
-        Activity activity = getActivity();
-        if (null == activity || activity.isFinishing()) {
-            return;
-        }
-        DevicePolicyManager manager =
-                (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        manager.wipeData(0);
-        // The screen turns off here
-    }
-
-}

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java b/prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java
deleted file mode 100644
index deed2f6..0000000
--- a/prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java
+++ /dev/null

@@ -1,68 +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.basicmanagedprofile;
-
-import android.app.Activity;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-
-/**
- * This activity is started after the provisioning is complete in {@link BasicDeviceAdminReceiver}.
- */
-public class EnableProfileActivity extends Activity implements View.OnClickListener {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (null == savedInstanceState) {
-            // Important: After the profile has been created, the MDM must enable it for corporate
-            // apps to become visible in the launcher.
-            enableProfile();
-        }
-        // This is just a friendly shortcut to the main screen.
-        setContentView(R.layout.activity_setup);
-        findViewById(R.id.icon).setOnClickListener(this);
-    }
-
-    private void enableProfile() {
-        DevicePolicyManager manager =
-            (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
-        ComponentName componentName = BasicDeviceAdminReceiver.getComponentName(this);
-        // This is the name for the newly created managed profile.
-        manager.setProfileName(componentName, getString(R.string.profile_name));
-        // We enable the profile here.
-        manager.setProfileEnabled(componentName);
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.icon: {
-                // Opens up the main screen
-                startActivity(new Intent(this, MainActivity.class));
-                finish();
-                break;
-            }
-        }
-    }
-
-}

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java b/prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java
deleted file mode 100644
index 7da6e02..0000000
--- a/prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java
+++ /dev/null

@@ -1,100 +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.basicmanagedprofile;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Toast;
-
-import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE;
-import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME;
-
-/**
- * This {@link Fragment} handles initiation of managed profile provisioning.
- */
-public class SetupProfileFragment extends Fragment implements View.OnClickListener {
-
-    private static final int REQUEST_PROVISION_MANAGED_PROFILE = 1;
-
-    public static SetupProfileFragment newInstance() {
-        return new SetupProfileFragment();
-    }
-
-    public SetupProfileFragment() {
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_setup_profile, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        view.findViewById(R.id.set_up_profile).setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.set_up_profile: {
-                provisionManagedProfile();
-                break;
-            }
-        }
-    }
-
-    /**
-     * Initiates the managed profile provisioning. If we already have a managed profile set up on
-     * this device, we will get an error dialog in the following provisioning phase.
-     */
-    private void provisionManagedProfile() {
-        Activity activity = getActivity();
-        if (null == activity) {
-            return;
-        }
-        Intent intent = new Intent(ACTION_PROVISION_MANAGED_PROFILE);
-        intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME,
-                        activity.getApplicationContext().getPackageName());
-        if (intent.resolveActivity(activity.getPackageManager()) != null) {
-            startActivityForResult(intent, REQUEST_PROVISION_MANAGED_PROFILE);
-            activity.finish();
-        } else {
-            Toast.makeText(activity, "Device provisioning is not enabled. Stopping.",
-                           Toast.LENGTH_SHORT).show();
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == REQUEST_PROVISION_MANAGED_PROFILE) {
-            if (resultCode == Activity.RESULT_OK) {
-                Toast.makeText(getActivity(), "Provisioning done.", Toast.LENGTH_SHORT).show();
-            } else {
-                Toast.makeText(getActivity(), "Provisioning failed.", Toast.LENGTH_SHORT).show();
-            }
-            return;
-        }
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-}

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index f66ab5a..0000000
--- a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,32 +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">BasicManagedProfile</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            This sample demonstrates how to create a managed profile. You can also learn how to
-            enable or disable other apps and how to set restrictions to them. Intents can be
-            configured to be forwarded between primary account and managed profile. Finally, you can
-            wipe all the data associated with the profile.
-            Note that there can only be one managed profile on a device. 
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/build.gradle b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/build.gradle
new file mode 100644
index 0000000..a0487e5
--- /dev/null
+++ b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/build.gradle

@@ -0,0 +1,62 @@
+
+
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 "android-L"
+
+    buildToolsVersion "19.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/BasicManagedProfile/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicDeviceAdminReceiver.java b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/BasicDeviceAdminReceiver.java
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/BasicDeviceAdminReceiver.java
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/BasicDeviceAdminReceiver.java

diff --git a/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java
new file mode 100644
index 0000000..ebea240
--- /dev/null
+++ b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/BasicManagedProfileFragment.java

@@ -0,0 +1,330 @@
+/*
+ * 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.basicmanagedprofile;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.ScrollView;
+import android.widget.Switch;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import static android.app.admin.DevicePolicyManager.FLAG_TO_MANAGED_PROFILE;
+import static android.app.admin.DevicePolicyManager.FLAG_TO_PRIMARY_USER;
+
+/**
+ * Provides several functions that are available in a managed profile. This includes
+ * enabling/disabling other apps, setting app restrictions, enabling/disabling intent forwarding,
+ * and wiping out all the data in the profile.
+ */
+public class BasicManagedProfileFragment extends Fragment
+    implements View.OnClickListener,
+    CompoundButton.OnCheckedChangeListener {
+
+    /** Package names of calculator */
+    private static final String[] PACKAGE_NAMES_CALCULATOR = {
+            "com.android.calculator2"
+    };
+
+    /** Package names of Chrome */
+    private static final String[] PACKAGE_NAMES_CHROME = {
+            "com.android.chrome",
+            "com.google.android.apps.chrome_dev",
+            "com.chrome.canary",
+            "com.chrome.beta",
+    };
+
+    private Button mButtonRemoveProfile;
+
+    /** Whether the calculator app is enabled in this profile */
+    private boolean mCalculatorEnabled;
+
+    /** Whether Chrome is enabled in this profile */
+    private boolean mChromeEnabled;
+
+    public BasicManagedProfileFragment() {
+    }
+
+    public static BasicManagedProfileFragment newInstance() {
+        return new BasicManagedProfileFragment();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_main, container, false);
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        // Gets an instance of DevicePolicyManager
+        DevicePolicyManager manager =
+            (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        // Retrieves whether the calculator app is enabled in this profile
+        mCalculatorEnabled = !manager.isApplicationBlocked(
+            BasicDeviceAdminReceiver.getComponentName(activity), PACKAGE_NAMES_CALCULATOR[0]);
+        // Retrieves whether Chrome is enabled in this profile
+        mChromeEnabled = false;
+        for (String packageName : PACKAGE_NAMES_CHROME) {
+            if (!manager.isApplicationBlocked(
+                    BasicDeviceAdminReceiver.getComponentName(activity), packageName)) {
+                mChromeEnabled = true;
+                return;
+            }
+        }
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        // Bind event listeners and initial states
+        view.findViewById(R.id.set_chrome_restrictions).setOnClickListener(this);
+        view.findViewById(R.id.clear_chrome_restrictions).setOnClickListener(this);
+        view.findViewById(R.id.enable_forwarding).setOnClickListener(this);
+        view.findViewById(R.id.disable_forwarding).setOnClickListener(this);
+        view.findViewById(R.id.send_intent).setOnClickListener(this);
+        mButtonRemoveProfile = (Button) view.findViewById(R.id.remove_profile);
+        mButtonRemoveProfile.setOnClickListener(this);
+        Switch toggleCalculator = (Switch) view.findViewById(R.id.toggle_calculator);
+        toggleCalculator.setChecked(mCalculatorEnabled);
+        toggleCalculator.setOnCheckedChangeListener(this);
+        Switch toggleChrome = (Switch) view.findViewById(R.id.toggle_chrome);
+        toggleChrome.setChecked(mChromeEnabled);
+        toggleChrome.setOnCheckedChangeListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.set_chrome_restrictions: {
+                setChromeRestrictions();
+                break;
+            }
+            case R.id.clear_chrome_restrictions: {
+                clearChromeRestrictions();
+                break;
+            }
+            case R.id.enable_forwarding: {
+                enableForwarding();
+                break;
+            }
+            case R.id.disable_forwarding: {
+                disableForwarding();
+                break;
+            }
+            case R.id.send_intent: {
+                sendIntent();
+                break;
+            }
+            case R.id.remove_profile: {
+                mButtonRemoveProfile.setEnabled(false);
+                removeProfile();
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+        switch (compoundButton.getId()) {
+            case R.id.toggle_calculator: {
+                setAppEnabled(PACKAGE_NAMES_CALCULATOR, checked);
+                mCalculatorEnabled = checked;
+                break;
+            }
+            case R.id.toggle_chrome: {
+                setAppEnabled(PACKAGE_NAMES_CHROME, checked);
+                mChromeEnabled = checked;
+                break;
+            }
+        }
+    }
+
+    /**
+     * Enables or disables the specified app in this profile.
+     *
+     * @param packageNames The package names of the target app.
+     * @param enabled Pass true to enable the app.
+     */
+    private void setAppEnabled(String[] packageNames, boolean enabled) {
+        Activity activity = getActivity();
+        if (null == activity) {
+            return;
+        }
+        DevicePolicyManager manager =
+            (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        for (String packageName : packageNames) {
+            // This is how you can enable or disable an app in a managed profile.
+            manager.setApplicationBlocked(BasicDeviceAdminReceiver.getComponentName(activity),
+                                          packageName, !enabled);
+        }
+        Toast.makeText(activity, enabled ? "Enabled" : "Disabled", Toast.LENGTH_SHORT).show();
+    }
+
+    /**
+     * Sets restrictions to Chrome
+     */
+    private void setChromeRestrictions() {
+        final Activity activity = getActivity();
+        if (null == activity) {
+            return;
+        }
+        final DevicePolicyManager manager =
+            (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        final Bundle settings = new Bundle();
+        settings.putString("EditBookmarksEnabled", "false");
+        settings.putString("IncognitoModeAvailability", "1");
+        settings.putString("ManagedBookmarks",
+                           "[{\"name\": \"Chromium\", \"url\": \"http://chromium.org\"}, " +
+                           "{\"name\": \"Google\", \"url\": \"https://www.google.com\"}]");
+        settings.putString("DefaultSearchProviderEnabled", "true");
+        settings.putString("DefaultSearchProviderName", "\"LMGTFY\"");
+        settings.putString("DefaultSearchProviderSearchURL",
+                "\"http://lmgtfy.com/?q={searchTerms}\"");
+        settings.putString("URLBlacklist", "[\"example.com\", \"example.org\"]");
+        StringBuilder message = new StringBuilder("Setting Chrome restrictions:");
+        for (String key : settings.keySet()) {
+            message.append("\n");
+            message.append(key);
+            message.append(": ");
+            message.append(settings.getString(key));
+        }
+        ScrollView view = new ScrollView(activity);
+        TextView text = new TextView(activity);
+        text.setText(message);
+        int size = (int) activity.getResources().getDimension(R.dimen.activity_horizontal_margin);
+        view.setPadding(size, size, size, size);
+        view.addView(text);
+        new AlertDialog.Builder(activity)
+                .setView(view)
+                .setNegativeButton(android.R.string.cancel, null)
+                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        for (String packageName : PACKAGE_NAMES_CHROME) {
+                            // This is how you can set restrictions to an app.
+                            // The format for settings in Bundle differs from app to app.
+                            manager.setApplicationRestrictions
+                                    (BasicDeviceAdminReceiver.getComponentName(activity),
+                                    packageName, settings);
+                            Toast.makeText(activity, "Restrictions set.",
+                                    Toast.LENGTH_SHORT).show();
+                        }
+                    }
+                })
+                .show();
+    }
+
+    /**
+     * Clears restrictions to Chrome
+     */
+    private void clearChromeRestrictions() {
+        final Activity activity = getActivity();
+        if (null == activity) {
+            return;
+        }
+        final DevicePolicyManager manager =
+                (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        // In order to clear restrictions, pass null as the restriction Bundle for
+        // setApplicationRestrictions
+        manager.setApplicationRestrictions
+                (BasicDeviceAdminReceiver.getComponentName(activity),
+                        PACKAGE_NAME_CHROME, null);
+        Toast.makeText(activity, R.string.cleared, Toast.LENGTH_SHORT).show();
+    }
+
+    /**
+     * Enables forwarding of share intent between private account and managed profile.
+     */
+    private void enableForwarding() {
+        Activity activity = getActivity();
+        if (null == activity || activity.isFinishing()) {
+            return;
+        }
+        DevicePolicyManager manager =
+            (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        try {
+            IntentFilter filter = new IntentFilter(Intent.ACTION_SEND);
+            filter.addDataType("text/plain");
+            filter.addDataType("image/jpeg");
+            // This is how you can register an IntentFilter as allowed pattern of Intent forwarding
+            manager.addForwardingIntentFilter(BasicDeviceAdminReceiver.getComponentName(activity),
+                                              filter,
+                                              FLAG_TO_PRIMARY_USER | FLAG_TO_MANAGED_PROFILE);
+        } catch (IntentFilter.MalformedMimeTypeException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Disables forwarding of all intents.
+     */
+    private void disableForwarding() {
+        Activity activity = getActivity();
+        if (null == activity || activity.isFinishing()) {
+            return;
+        }
+        DevicePolicyManager manager =
+            (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        manager.clearForwardingIntentFilters(BasicDeviceAdminReceiver.getComponentName(activity));
+    }
+
+    /**
+     * Sends a sample intent.
+     */
+    private void sendIntent() {
+        Activity activity = getActivity();
+        if (null == activity || activity.isFinishing()) {
+            return;
+        }
+        DevicePolicyManager manager =
+            (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setType("text/plain");
+        intent.putExtra(Intent.EXTRA_TEXT,
+                        manager.isProfileOwnerApp(activity.getApplicationContext().getPackageName())
+                                ? "From the managed account" : "From the primary account");
+        startActivity(intent);
+    }
+
+    /**
+     * Wipes out all the data related to this managed profile.
+     */
+    private void removeProfile() {
+        Activity activity = getActivity();
+        if (null == activity || activity.isFinishing()) {
+            return;
+        }
+        DevicePolicyManager manager =
+            (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        manager.wipeData(0);
+        // The screen turns off here
+    }
+
+}

diff --git a/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java
new file mode 100644
index 0000000..c4c5a93
--- /dev/null
+++ b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/EnableProfileActivity.java

@@ -0,0 +1,64 @@
+/*
+ * 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.basicmanagedprofile;
+
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+
+/**
+ * This activity is started after the provisioning is complete in {@link BasicDeviceAdminReceiver}.
+ */
+public class EnableProfileActivity extends Activity implements View.OnClickListener {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (null == savedInstanceState) {
+            // Important: After the profile has been created, the MDM must enable it for corporate
+            // apps to become visible in the launcher.
+            enableProfile();
+        }
+        // This is just a friendly shortcut to the main screen.
+        setContentView(R.layout.activity_setup);
+        findViewById(R.id.icon).setOnClickListener(this);
+    }
+
+    private void enableProfile() {
+        DevicePolicyManager manager =
+            (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+        // We enable the profile here.
+        manager.setProfileEnabled(BasicDeviceAdminReceiver.getComponentName(this));
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.icon: {
+                // Opens up the main screen
+                startActivity(new Intent(this, MainActivity.class));
+                finish();
+                break;
+            }
+        }
+    }
+
+}

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/MainActivity.java b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/java/com/example/android/basicmanagedprofile/MainActivity.java
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/MainActivity.java

diff --git a/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java
new file mode 100644
index 0000000..2bd5157
--- /dev/null
+++ b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/java/com/example/android/basicmanagedprofile/SetupProfileFragment.java

@@ -0,0 +1,90 @@
+/*
+ * 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.basicmanagedprofile;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE;
+import static android.app.admin.DevicePolicyManager.EXTRA_DEVICE_ADMIN;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEFAULT_MANAGED_PROFILE_NAME;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME;
+
+/**
+ * This {@link Fragment} handles initiation of managed profile provisioning.
+ */
+public class SetupProfileFragment extends Fragment implements View.OnClickListener {
+
+    public static SetupProfileFragment newInstance() {
+        return new SetupProfileFragment();
+    }
+
+    public SetupProfileFragment() {
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_setup_profile, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        view.findViewById(R.id.set_up_profile).setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.set_up_profile: {
+                provisionManagedProfile();
+                break;
+            }
+        }
+    }
+
+    /**
+     * Initiates the managed profile provisioning. If we already have a managed profile set up on
+     * this device, we will get an error dialog in the following provisioning phase.
+     */
+    private void provisionManagedProfile() {
+        Activity activity = getActivity();
+        if (null == activity) {
+            return;
+        }
+        Intent intent = new Intent(ACTION_PROVISION_MANAGED_PROFILE);
+        intent.putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME,
+                        activity.getApplicationContext().getPackageName());
+        intent.putExtra(EXTRA_PROVISIONING_DEFAULT_MANAGED_PROFILE_NAME,
+                        "Sample Managed Profile");
+        intent.putExtra(EXTRA_DEVICE_ADMIN, BasicDeviceAdminReceiver.getComponentName(activity));
+        if (intent.resolveActivity(activity.getPackageManager()) != null) {
+            startActivity(intent);
+            activity.finish();
+        } else {
+            Toast.makeText(activity, "Device provisioning is not enabled. Stopping.",
+                           Toast.LENGTH_SHORT).show();
+        }
+    }
+
+}

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-xxhdpi/badge.png b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xxhdpi/badge.png
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-xxhdpi/badge.png
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xxhdpi/badge.png
Binary files differ

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable/ic_launcher_badged.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable/ic_launcher_badged.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/drawable/ic_launcher_badged.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/drawable/ic_launcher_badged.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/activity_main_real.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/activity_main_real.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/activity_main_real.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/activity_main_real.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/activity_setup.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/activity_setup.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/activity_setup.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/activity_setup.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/fragment_main.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/fragment_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/fragment_main.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/fragment_main.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/fragment_setup_profile.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/layout/fragment_setup_profile.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/layout/fragment_setup_profile.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values-w820dp/dimens.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values-w820dp/dimens.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values-w820dp/dimens.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/base-strings.xml
new file mode 100644
index 0000000..cef45aa
--- /dev/null
+++ b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/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">BasicManagedProfile</string>
+    <string name="intro_message">
+        <![CDATA[
+        
+            
+            This sample demonstrates how to create a managed profile. You can also learn how to
+            enable or disable other apps and how to set restrictions to them. Intents can be
+            configured to be forwarded between primary account and managed profile. Finally, you can
+            wipe all the data associated with the profile.
+            Note that there can only be one managed profile on a device. 
+            
+        
+        ]]>
+    </string>
+</resources>

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/styles.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/Application/src/main/res/xml/basic_device_admin_receiver.xml b/prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/xml/basic_device_admin_receiver.xml
similarity index 100%
rename from prebuilts/gradle/BasicManagedProfile/Application/src/main/res/xml/basic_device_admin_receiver.xml
rename to prebuilts/gradle/BasicManagedProfile/BasicManagedProfileSample/src/main/res/xml/basic_device_admin_receiver.xml

diff --git a/prebuilts/gradle/BasicManagedProfile/CONTRIB.md b/prebuilts/gradle/BasicManagedProfile/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/BasicManagedProfile/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/BasicManagedProfile/LICENSE b/prebuilts/gradle/BasicManagedProfile/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/BasicManagedProfile/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/BasicManagedProfile/README.md b/prebuilts/gradle/BasicManagedProfile/README.md
deleted file mode 100644
index c1e4fde..0000000
--- a/prebuilts/gradle/BasicManagedProfile/README.md
+++ /dev/null

@@ -1,52 +0,0 @@
-Android BasicManagedProfile Sample
-==============================
-
-This sample demonstrates how to create a managed profile. You can also learn how to enable or
-disable other apps and how to set restrictions to them. Intents can be configured to be forwarded
-between primary account and managed profile. Finally, you can wipe all the data associated with the
-profile. Note that there can only be one managed profile on a device. 
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-BasicManagedProfile
-
-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/BasicManagedProfile/README.txt b/prebuilts/gradle/BasicManagedProfile/README.txt
new file mode 100644
index 0000000..9616c58
--- /dev/null
+++ b/prebuilts/gradle/BasicManagedProfile/README.txt

@@ -0,0 +1,18 @@
+Build Instructions
+-------------------
+
+This sample uses the Gradle build system. To build this project, use the
+"gradlew build" command or use "Import Project" in Android Studio.
+
+To see a list of all available commands, run "gradlew tasks".
+
+Dependencies
+-------------
+
+- Android SDK Build-tools v18.1
+- Android Support Repository v2
+
+Dependencies are available for download via the Android SDK Manager.
+
+Android Studio is available for download at:
+    http://developer.android.com/sdk/installing/studio.html

diff --git a/prebuilts/gradle/BasicManagedProfile/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicManagedProfile/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicManagedProfile/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicManagedProfile/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicManagedProfile/packaging.yaml b/prebuilts/gradle/BasicManagedProfile/packaging.yaml
deleted file mode 100644
index 81ec492..0000000
--- a/prebuilts/gradle/BasicManagedProfile/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:   [Admin]
-languages:    [Java]
-solutions:    [Mobile]
-github:       googlesamples/android-BasicManagedProfile
-level:        BEGINNER
-icon:         BasicManagedProfileSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2

diff --git a/prebuilts/gradle/BasicManagedProfile/settings.gradle b/prebuilts/gradle/BasicManagedProfile/settings.gradle
index 9464a35..f896148 100644
--- a/prebuilts/gradle/BasicManagedProfile/settings.gradle
+++ b/prebuilts/gradle/BasicManagedProfile/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicManagedProfileSample'

diff --git a/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicMediaDecoder/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/basicmediadecoder/MainActivity.java b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/basicmediadecoder/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/basicmediadecoder/MainActivity.java
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/basicmediadecoder/MainActivity.java

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/common/media/CameraHelper.java b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/common/media/CameraHelper.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/common/media/CameraHelper.java
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/common/media/CameraHelper.java

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play.png b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play.png
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play_disabled.png b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play_disabled.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_action_play_disabled.png
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_action_play_disabled.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play.png b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play.png
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play_disabled.png b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play_disabled.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_action_play_disabled.png
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_action_play_disabled.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play.png b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play.png
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play_disabled.png b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play_disabled.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_action_play_disabled.png
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_action_play_disabled.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable/selector_play.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable/selector_play.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/drawable/selector_play.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/drawable/selector_play.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/menu/action_menu.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/menu/action_menu.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/menu/action_menu.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/menu/action_menu.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/raw/vid_bigbuckbunny.mp4 b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/raw/vid_bigbuckbunny.mp4
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/raw/vid_bigbuckbunny.mp4
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/raw/vid_bigbuckbunny.mp4
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaDecoder/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicMediaDecoder/BasicMediaDecoderSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicMediaDecoder/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicMediaDecoder/settings.gradle b/prebuilts/gradle/BasicMediaDecoder/settings.gradle
index 9464a35..1e76e09 100644
--- a/prebuilts/gradle/BasicMediaDecoder/settings.gradle
+++ b/prebuilts/gradle/BasicMediaDecoder/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicMediaDecoderSample'

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicMediaRouter/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index f84b7df..0000000
--- a/prebuilts/gradle/BasicMediaRouter/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,39 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.basicmediarouter"
-    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=".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/BasicMediaRouter/Application/tests/AndroidManifest.xml b/prebuilts/gradle/BasicMediaRouter/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 927504e..0000000
--- a/prebuilts/gradle/BasicMediaRouter/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.basicmediarouter.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.basicmediarouter"
-            android:label="Tests for com.example.android.basicmediarouter" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/build.gradle b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicMediaRouter/BasicMediaRouterSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..33c20d5
--- /dev/null
+++ b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/AndroidManifest.xml

@@ -0,0 +1,41 @@
+<?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.basicmediarouter"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="17"
+        android:targetSdkVersion="17" />
+
+    <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>
+    </application>
+</manifest>

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/MainActivity.java b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/MainActivity.java
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/MainActivity.java

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/basicmediarouter/SamplePresentation.java

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/display.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/display.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/display.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/display.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/menu/main.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/colors.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/colors.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/colors.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/styles.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..8800232
--- /dev/null
+++ b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.basicmediarouter.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.basicmediarouter"
+            android:label="Tests for com.example.android.basicmediarouter" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicMediaRouter/Application/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java b/prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicMediaRouter/Application/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java
rename to prebuilts/gradle/BasicMediaRouter/BasicMediaRouterSample/tests/src/com/example/android/basicmediarouter/tests/SampleTests.java

diff --git a/prebuilts/gradle/BasicMediaRouter/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicMediaRouter/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicMediaRouter/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicMediaRouter/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicMediaRouter/settings.gradle b/prebuilts/gradle/BasicMediaRouter/settings.gradle
index 9464a35..9d5cbc2 100644
--- a/prebuilts/gradle/BasicMediaRouter/settings.gradle
+++ b/prebuilts/gradle/BasicMediaRouter/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicMediaRouterSample'

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicMultitouch/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index fc11177..0000000
--- a/prebuilts/gradle/BasicMultitouch/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,41 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.basicmultitouch"
-    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=".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>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/build.gradle b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicMultitouch/BasicMultitouchSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..043345c
--- /dev/null
+++ b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/AndroidManifest.xml

@@ -0,0 +1,43 @@
+<?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.basicmultitouch"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="17" />
+
+    <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>
+    </application>
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/MainActivity.java b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/MainActivity.java
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/MainActivity.java

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/Pools.java b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/Pools.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/Pools.java
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/Pools.java

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/basicmultitouch/TouchDisplayView.java

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/layout/layout_mainactivity.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/layout/layout_mainactivity.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/layout/layout_mainactivity.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/layout/layout_mainactivity.xml

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v11/styles.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v11/styles.xml

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v14/styles.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values-v14/styles.xml

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/styles.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicMultitouch/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicMultitouch/BasicMultitouchSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicMultitouch/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicMultitouch/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicMultitouch/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicMultitouch/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicMultitouch/settings.gradle b/prebuilts/gradle/BasicMultitouch/settings.gradle
index 9464a35..6e6c5ba 100644
--- a/prebuilts/gradle/BasicMultitouch/settings.gradle
+++ b/prebuilts/gradle/BasicMultitouch/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicMultitouchSample'

diff --git a/prebuilts/gradle/BasicNetworking/Application/build.gradle b/prebuilts/gradle/BasicNetworking/Application/build.gradle
deleted file mode 100644
index 85e2282..0000000
--- a/prebuilts/gradle/BasicNetworking/Application/build.gradle
+++ /dev/null

@@ -1,68 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-repositories {
-    jcenter()
-}
-
-
-dependencies {
-
-    compile "com.android.support:support-v4:21.+"
-
-}
-
-// 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.0.0"
-
-    defaultConfig {
-        minSdkVersion 4
-        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/BasicNetworking/Application/tests/AndroidManifest.xml b/prebuilts/gradle/BasicNetworking/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 327ae46..0000000
--- a/prebuilts/gradle/BasicNetworking/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.basicnetworking.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.basicnetworking"
-            android:label="Tests for com.example.android.basicnetworking" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/build.gradle b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicNetworking/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/MainActivity.java b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/MainActivity.java
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/MainActivity.java

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/basicnetworking/SimpleTextFragment.java

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/menu/main.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/values/styles.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicNetworking/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..293c16b
--- /dev/null
+++ b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.basicnetworking.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.basicnetworking"
+            android:label="Tests for com.example.android.basicnetworking" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicNetworking/Application/tests/src/com/example/android/basicnetworking/tests/SampleTests.java b/prebuilts/gradle/BasicNetworking/BasicNetworkingSample/tests/src/com/example/android/basicnetworking/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicNetworking/Application/tests/src/com/example/android/basicnetworking/tests/SampleTests.java
rename to prebuilts/gradle/BasicNetworking/BasicNetworkingSample/tests/src/com/example/android/basicnetworking/tests/SampleTests.java

diff --git a/prebuilts/gradle/BasicNetworking/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicNetworking/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicNetworking/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicNetworking/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicNetworking/settings.gradle b/prebuilts/gradle/BasicNetworking/settings.gradle
index 9464a35..453e7cd 100644
--- a/prebuilts/gradle/BasicNetworking/settings.gradle
+++ b/prebuilts/gradle/BasicNetworking/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicNetworkingSample'

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicNotifications/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 01f8e3a..0000000
--- a/prebuilts/gradle/BasicNotifications/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.basicnotifications"
-    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=".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/BasicNotifications/Application/tests/AndroidManifest.xml b/prebuilts/gradle/BasicNotifications/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 5b25bbe..0000000
--- a/prebuilts/gradle/BasicNotifications/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.basicnotifications.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.basicnotifications"
-            android:label="Tests for com.example.android.basicnotifications" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/build.gradle b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicNotifications/BasicNotificationsSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..1e37d0b
--- /dev/null
+++ b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.basicnotifications"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="17"/>
+
+    <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>
+    </application>
+
+</manifest>

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/java/com/example/android/basicnotifications/MainActivity.java b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/java/com/example/android/basicnotifications/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/java/com/example/android/basicnotifications/MainActivity.java
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/java/com/example/android/basicnotifications/MainActivity.java

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_notification.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_notification.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/ic_stat_notification.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_notification.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_notification.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_notification.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_notification.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-mdpi/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-mdpi/ic_stat_notification.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_notification.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_notification.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_notification.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_notification.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_notification.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_notification.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/layout/sample_layout.xml b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/layout/sample_layout.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/layout/sample_layout.xml
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/layout/sample_layout.xml

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicNotifications/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..62c01e8
--- /dev/null
+++ b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.basicnotifications.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.basicnotifications"
+            android:label="Tests for com.example.android.basicnotifications" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicNotifications/Application/tests/src/com/example/android/basicnotifications/tests/SampleTests.java b/prebuilts/gradle/BasicNotifications/BasicNotificationsSample/tests/src/com/example/android/basicnotifications/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicNotifications/Application/tests/src/com/example/android/basicnotifications/tests/SampleTests.java
rename to prebuilts/gradle/BasicNotifications/BasicNotificationsSample/tests/src/com/example/android/basicnotifications/tests/SampleTests.java

diff --git a/prebuilts/gradle/BasicNotifications/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicNotifications/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicNotifications/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicNotifications/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicNotifications/settings.gradle b/prebuilts/gradle/BasicNotifications/settings.gradle
index 9464a35..b33d67f 100644
--- a/prebuilts/gradle/BasicNotifications/settings.gradle
+++ b/prebuilts/gradle/BasicNotifications/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicNotificationsSample'

diff --git a/prebuilts/gradle/BasicRenderScript/Application/AndroidManifest.xml b/prebuilts/gradle/BasicRenderScript/Application/AndroidManifest.xml
deleted file mode 100644
index 21c3a62..0000000
--- a/prebuilts/gradle/BasicRenderScript/Application/AndroidManifest.xml
+++ /dev/null

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.basicrenderscript"
-    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.basicrenderscript.MainActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/app_name"
-            android:theme="@style/FullscreenTheme" >
-            <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/BasicRenderScript/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicRenderScript/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 3bc65ff..0000000
--- a/prebuilts/gradle/BasicRenderScript/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,43 +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.basicrenderscript"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <application
-        android:allowBackup="true"
-        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
-        android:theme="@style/AppTheme">
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:theme="@style/FullscreenTheme">
-            <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/BasicRenderScript/Application/tests/AndroidManifest.xml b/prebuilts/gradle/BasicRenderScript/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 34eca02..0000000
--- a/prebuilts/gradle/BasicRenderScript/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.basicrenderscript.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.basicrenderscript"
-            android:label="Tests for com.example.android.basicrenderscript" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/AndroidManifest.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/AndroidManifest.xml
new file mode 100644
index 0000000..1e35dc3
--- /dev/null
+++ b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/AndroidManifest.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.basicrenderscript"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="19" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.example.android.basicrenderscript.MainActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/app_name"
+            android:theme="@style/FullscreenTheme" >
+            <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/SynchronizedNotifications/Application/build.gradle b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/build.gradle
similarity index 100%
rename from prebuilts/gradle/SynchronizedNotifications/Application/build.gradle
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/build.gradle

diff --git a/prebuilts/gradle/BasicRenderScript/Application/project.properties b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/project.properties
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/project.properties
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/project.properties

diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..e1e2dfc
--- /dev/null
+++ b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/AndroidManifest.xml

@@ -0,0 +1,45 @@
+<?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.basicrenderscript"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="19" />
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:icon="@drawable/ic_launcher"
+        android:theme="@style/AppTheme">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/FullscreenTheme">
+            <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/BasicRenderScript/Application/src/main/java/com/example/android/basicrenderscript/MainActivity.java b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/basicrenderscript/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/java/com/example/android/basicrenderscript/MainActivity.java
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/basicrenderscript/MainActivity.java

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/java/com/example/android/common/media/CameraHelper.java b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/common/media/CameraHelper.java
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/java/com/example/android/common/media/CameraHelper.java
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/common/media/CameraHelper.java

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-nodpi/data.jpg b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-nodpi/data.jpg
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-nodpi/data.jpg
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-nodpi/data.jpg
Binary files differ

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/layout/main_layout.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/layout/main_layout.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/layout/main_layout.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/layout/main_layout.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v11/styles.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v11/styles.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v14/styles.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values-v14/styles.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/attrs.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/attrs.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/attrs.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/attrs.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/colors.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/colors.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/colors.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/styles.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicRenderScript/Application/src/main/rs/saturation.rs b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/rs/saturation.rs
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/src/main/rs/saturation.rs
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/src/main/rs/saturation.rs

diff --git a/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..02a8db3
--- /dev/null
+++ b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.basicrenderscript.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="8"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.basicrenderscript"
+            android:label="Tests for com.example.android.basicrenderscript" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicRenderScript/Application/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java b/prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicRenderScript/Application/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java
rename to prebuilts/gradle/BasicRenderScript/BasicRenderScriptSample/tests/src/com/example/android/basicrenderscript/tests/SampleTests.java

diff --git a/prebuilts/gradle/BasicRenderScript/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicRenderScript/gradle/wrapper/gradle-wrapper.properties
index c68abf9..8e914ab 100644
--- a/prebuilts/gradle/BasicRenderScript/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicRenderScript/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicRenderScript/settings.gradle b/prebuilts/gradle/BasicRenderScript/settings.gradle
index 9464a35..cb17006 100644
--- a/prebuilts/gradle/BasicRenderScript/settings.gradle
+++ b/prebuilts/gradle/BasicRenderScript/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicRenderScriptSample'

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicSyncAdapter/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 4222b47..0000000
--- a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,100 +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.
--->
-
-
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.basicsyncadapter"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <!-- SyncAdapters are available in API 5 and above. We use API 7 as a baseline for samples. -->
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <!-- Required for fetching feed data. -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <!-- Required to register a SyncStatusObserver to display a "syncing..." progress indicator. -->
-    <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
-    <!-- Required to enable our SyncAdapter after it's created. -->
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
-    <!-- Required because we're manually creating a new account. -->
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
-
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-
-        <!-- Main activity, responsible for showing a list of feed entries. -->
-        <activity
-            android:name=".EntryListActivity"
-            android:label="@string/app_name" >
-            <!-- This intent filter places this activity in the system's app launcher. -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <!-- ContentProvider to store feed data.
-
-        The "authorities" here are defined as part of a ContentProvider interface. It's used here
-        as an attachment point for the SyncAdapter. See res/xml/syncadapter.xml and
-        SyncService.java.
-
-        Since this ContentProvider is not exported, it will not be accessible outside of this app's
-        package. -->
-        <provider
-            android:name=".provider.FeedProvider"
-            android:authorities="com.example.android.basicsyncadapter"
-            android:exported="false" />
-
-        <!-- This service implements our SyncAdapter. It needs to be exported, so that the system
-        sync framework can access it. -->
-        <service android:name=".SyncService"
-            android:exported="true">
-            <!-- This intent filter is required. It allows the system to launch our sync service
-            as needed. -->
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-            <!-- This points to a required XML file which describes our SyncAdapter. -->
-            <meta-data android:name="android.content.SyncAdapter"
-                android:resource="@xml/syncadapter" />
-        </service>
-
-        <!-- This implements the account we'll use as an attachment point for our SyncAdapter. Since
-        our SyncAdapter doesn't need to authenticate the current user (it just fetches a public RSS
-        feed), this account's implementation is largely empty.
-
-        It's also possible to attach a SyncAdapter to an existing account provided by another
-        package. In that case, this element could be omitted here. -->
-        <service android:name="com.example.android.common.accounts.GenericAccountService">
-            <!-- Required filter used by the system to launch our account service. -->
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator" />
-            </intent-filter>
-            <!-- This points to an XMLf ile which describes our account service. -->
-            <meta-data android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator" />
-        </service>
-
-    </application>
-
-</manifest>

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/tests/AndroidManifest.xml b/prebuilts/gradle/BasicSyncAdapter/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 4422a8e..0000000
--- a/prebuilts/gradle/BasicSyncAdapter/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.basicsyncadapter.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.basicsyncadapter"
-            android:label="Tests for com.example.android.basicsyncadapter" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/build.gradle b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicSyncAdapter/BasicSyncAdapterSample/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..dd59b06
--- /dev/null
+++ b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/AndroidManifest.xml

@@ -0,0 +1,102 @@
+<?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.basicsyncadapter"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <!-- SyncAdapters are available in API 5 and above. We use API 7 as a baseline for samples. -->
+    <uses-sdk
+        android:minSdkVersion="7"
+        android:targetSdkVersion="17" />
+
+    <!-- Required for fetching feed data. -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <!-- Required to register a SyncStatusObserver to display a "syncing..." progress indicator. -->
+    <uses-permission android:name="android.permission.READ_SYNC_STATS"/>
+    <!-- Required to enable our SyncAdapter after it's created. -->
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
+    <!-- Required because we're manually creating a new account. -->
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
+
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+
+        <!-- Main activity, responsible for showing a list of feed entries. -->
+        <activity
+            android:name=".EntryListActivity"
+            android:label="@string/app_name" >
+            <!-- This intent filter places this activity in the system's app launcher. -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <!-- ContentProvider to store feed data.
+
+        The "authorities" here are defined as part of a ContentProvider interface. It's used here
+        as an attachment point for the SyncAdapter. See res/xml/syncadapter.xml and
+        SyncService.java.
+
+        Since this ContentProvider is not exported, it will not be accessible outside of this app's
+        package. -->
+        <provider
+            android:name=".provider.FeedProvider"
+            android:authorities="com.example.android.basicsyncadapter"
+            android:exported="false" />
+
+        <!-- This service implements our SyncAdapter. It needs to be exported, so that the system
+        sync framework can access it. -->
+        <service android:name=".SyncService"
+            android:exported="true">
+            <!-- This intent filter is required. It allows the system to launch our sync service
+            as needed. -->
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter" />
+            </intent-filter>
+            <!-- This points to a required XML file which describes our SyncAdapter. -->
+            <meta-data android:name="android.content.SyncAdapter"
+                android:resource="@xml/syncadapter" />
+        </service>
+
+        <!-- This implements the account we'll use as an attachment point for our SyncAdapter. Since
+        our SyncAdapter doesn't need to authenticate the current user (it just fetches a public RSS
+        feed), this account's implementation is largely empty.
+
+        It's also possible to attach a SyncAdapter to an existing account provided by another
+        package. In that case, this element could be omitted here. -->
+        <service android:name="com.example.android.common.accounts.GenericAccountService">
+            <!-- Required filter used by the system to launch our account service. -->
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+            <!-- This points to an XMLf ile which describes our account service. -->
+            <meta-data android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+        </service>
+
+    </application>
+
+</manifest>

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListActivity.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/EntryListFragment.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncAdapter.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncService.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncService.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncService.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncService.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/SyncUtils.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/net/FeedParser.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedContract.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/basicsyncadapter/provider/FeedProvider.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/accounts/GenericAccountService.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/accounts/GenericAccountService.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/accounts/GenericAccountService.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/accounts/GenericAccountService.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/db/SelectionBuilder.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/db/SelectionBuilder.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/db/SelectionBuilder.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/db/SelectionBuilder.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_action_refresh.png
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_action_refresh.png
Binary files differ

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/actionbar_indeterminate_progress.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/actionbar_indeterminate_progress.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/actionbar_indeterminate_progress.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/actionbar_indeterminate_progress.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/activity_entry_list.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/activity_entry_list.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/activity_entry_list.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/activity_entry_list.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/menu/main.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/attrs.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/attrs.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/attrs.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/attrs.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/dimen.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/dimen.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/dimen.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/dimen.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/xml/authenticator.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/authenticator.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/xml/authenticator.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/authenticator.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/xml/syncadapter.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/syncadapter.xml
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/src/main/res/xml/syncadapter.xml
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/src/main/res/xml/syncadapter.xml

diff --git a/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/tests/AndroidManifest.xml b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..44c910a
--- /dev/null
+++ b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.basicsyncadapter.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.basicsyncadapter"
+            android:label="Tests for com.example.android.basicsyncadapter" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/BasicSyncAdapter/Application/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java b/prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/BasicSyncAdapter/Application/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java
rename to prebuilts/gradle/BasicSyncAdapter/BasicSyncAdapterSample/tests/src/com/example/android/basicsyncadapter/tests/SampleTests.java

diff --git a/prebuilts/gradle/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicSyncAdapter/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicSyncAdapter/settings.gradle b/prebuilts/gradle/BasicSyncAdapter/settings.gradle
index 9464a35..a691e9e 100644
--- a/prebuilts/gradle/BasicSyncAdapter/settings.gradle
+++ b/prebuilts/gradle/BasicSyncAdapter/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BasicSyncAdapterSample'

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/basictransition/MainActivity.java b/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/basictransition/MainActivity.java
deleted file mode 100644
index 7eeac2e..0000000
--- a/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/basictransition/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.basictransition;
-
-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();
-            BasicTransitionFragment fragment = new BasicTransitionFragment();
-            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/BasicTransition/BasicTransitionSample/build.gradle b/prebuilts/gradle/BasicTransition/BasicTransitionSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BasicTransition/BasicTransitionSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BasicTransition/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/BasicTransitionFragment.java

diff --git a/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/MainActivity.java b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/MainActivity.java
new file mode 100644
index 0000000..32158b7
--- /dev/null
+++ b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/basictransition/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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.basictransition;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        BasicTransitionFragment fragment = new BasicTransitionFragment();
+        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/BasicTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/drawable/oval.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable/oval.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/drawable/oval.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/drawable/oval.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/activity_basic_transition.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/activity_basic_transition.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/layout/activity_basic_transition.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/activity_basic_transition.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/fragment_basic_transition.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/fragment_basic_transition.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/layout/fragment_basic_transition.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/fragment_basic_transition.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene1.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene1.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene1.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene1.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene2.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene2.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene2.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene2.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene3.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene3.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/layout/scene3.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/layout/scene3.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/menu/main.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/transition/changebounds_fadein_together.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/transition/changebounds_fadein_together.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/transition/changebounds_fadein_together.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/transition/changebounds_fadein_together.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/transition/scene3_transition_manager.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/transition/scene3_transition_manager.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/transition/scene3_transition_manager.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/transition/scene3_transition_manager.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/values-w820dp/dimens.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/values-w820dp/dimens.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values-w820dp/dimens.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BasicTransition/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BasicTransition/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BasicTransition/BasicTransitionSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BasicTransition/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BasicTransition/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BasicTransition/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BasicTransition/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BasicTransition/settings.gradle b/prebuilts/gradle/BasicTransition/settings.gradle
index 9464a35..fae2688 100644
--- a/prebuilts/gradle/BasicTransition/settings.gradle
+++ b/prebuilts/gradle/BasicTransition/settings.gradle

@@ -1 +1 @@
-include 'Application'
+include 'BasicTransitionSample'

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/MainActivity.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/MainActivity.java
deleted file mode 100644
index 5362693..0000000
--- a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/MainActivity.java
+++ /dev/null

@@ -1,94 +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.batchstepsensor;
-
-import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.view.Menu;
-
-import com.example.android.common.activities.SampleActivityBase;
-import com.example.android.common.logger.Log;
-
-import com.example.android.batchstepsensor.cardstream.CardStream;
-import com.example.android.batchstepsensor.cardstream.CardStreamFragment;
-import com.example.android.batchstepsensor.cardstream.CardStreamState;
-import com.example.android.batchstepsensor.cardstream.OnCardClickListener;
-import com.example.android.batchstepsensor.cardstream.StreamRetentionFragment;
-
-public class MainActivity extends SampleActivityBase implements CardStream {
-    public static final String TAG = "MainActivity";
-    public static final String FRAGTAG = "BatchStepSensorFragment";
-
-    private CardStreamFragment mCardStreamFragment;
-
-    private StreamRetentionFragment mRetentionFragment;
-    private static final String RETENTION_TAG = "retention";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        FragmentManager fm = getSupportFragmentManager();
-        BatchStepSensorFragment fragment =
-                (BatchStepSensorFragment) fm.findFragmentByTag(FRAGTAG);
-
-        if (fragment == null) {
-            FragmentTransaction transaction = fm.beginTransaction();
-            fragment = new BatchStepSensorFragment();
-            transaction.add(fragment, FRAGTAG);
-            transaction.commit();
-        }
-
-        // Use fragment as click listener for cards, but must implement correct interface
-        if (!(fragment instanceof OnCardClickListener)){
-            throw new ClassCastException("BatchStepSensorFragment must " +
-                    "implement OnCardClickListener interface.");
-        }
-        OnCardClickListener clickListener = (OnCardClickListener) fm.findFragmentByTag(FRAGTAG);
-
-        mRetentionFragment = (StreamRetentionFragment) fm.findFragmentByTag(RETENTION_TAG);
-        if (mRetentionFragment == null) {
-            mRetentionFragment = new StreamRetentionFragment();
-            fm.beginTransaction().add(mRetentionFragment, RETENTION_TAG).commit();
-        } else {
-            // If the retention fragment already existed, we need to pull some state.
-            // pull state out
-            CardStreamState state = mRetentionFragment.getCardStream();
-
-            // dump it in CardStreamFragment.
-            mCardStreamFragment =
-                    (CardStreamFragment) fm.findFragmentById(R.id.fragment_cardstream);
-            mCardStreamFragment.restoreState(state, clickListener);
-        }
-    }
-
-    public CardStreamFragment getCardStream() {
-        if (mCardStreamFragment == null) {
-            mCardStreamFragment = (CardStreamFragment)
-                    getSupportFragmentManager().findFragmentById(R.id.fragment_cardstream);
-        }
-        return mCardStreamFragment;
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        CardStreamState state = getCardStream().dumpState();
-        mRetentionFragment.storeCardStream(state);
-    }
-}

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardActionButton.java b/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardActionButton.java
deleted file mode 100644
index 054cc72..0000000
--- a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardActionButton.java
+++ /dev/null

@@ -1,76 +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.batchstepsensor.cardstream;
-
-import android.content.Context;
-import android.os.Build;
-import android.support.v4.view.ViewCompat;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.animation.BounceInterpolator;
-import android.view.animation.DecelerateInterpolator;
-import android.widget.Button;
-
-/**
- * Custom Button with a special 'pressed' effect for touch events.
- */
-public class CardActionButton extends Button {
-
-    public CardActionButton(Context context) {
-        super(context);
-    }
-
-    public CardActionButton(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public CardActionButton(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN: {
-                setPressed(true);
-                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
-                    animate().scaleX(0.98f).scaleY(0.98f).setDuration(100)
-                        .setInterpolator(new DecelerateInterpolator());
-                } else {
-                    ViewCompat.setElevation(this, 8.f);
-                }
-                break;
-            }
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL: {
-                setPressed(false);
-                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT) {
-                    animate().scaleX(1.f).scaleY(1.f).setDuration(50)
-                        .setInterpolator(new BounceInterpolator());
-                } else {
-                    ViewCompat.setElevation(this, 0.f);
-                }
-                break;
-            }
-        }
-
-        return super.onTouchEvent(event);
-    }
-
-}
-

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-v21/card_action_bg.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-v21/card_action_bg.xml
deleted file mode 100644
index 978415a..0000000
--- a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-v21/card_action_bg.xml
+++ /dev/null

@@ -1,20 +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.
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/card_action_ripple">
-    <item android:drawable="@color/card_action_item_bg" />
-</ripple>

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-v21/card_action_bg_negative.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-v21/card_action_bg_negative.xml
deleted file mode 100644
index feed3c6..0000000
--- a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-v21/card_action_bg_negative.xml
+++ /dev/null

@@ -1,20 +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.
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/card_action_negative_ripple">
-    <item android:drawable="@color/card_action_item_bg" />
-</ripple>

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-v21/card_action_bg_positive.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-v21/card_action_bg_positive.xml
deleted file mode 100644
index 0d568ce..0000000
--- a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-v21/card_action_bg_positive.xml
+++ /dev/null

@@ -1,20 +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.
--->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/card_action_positive_ripple">
-    <item android:drawable="@color/card_action_item_bg" />
-</ripple>

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/color.xml b/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/color.xml
deleted file mode 100644
index 593ccfd..0000000
--- a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/color.xml
+++ /dev/null

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="card_action_inverted">@android:color/white</color>
-
-    <color name="card_content_textcolor">#444</color>
-
-    <color name="card_action_bg">#DDD</color>
-    <color name="card_action_item_bg">#F4F4F4</color>
-
-    <!-- Neutral Actions -->
-    <color name="card_action_focused">#FFE3F4FC</color>
-    <color name="card_action">#FF47B4EA</color>
-    <color name="card_action_ripple">#CC47B4EA</color>
-
-    <!-- Negative Actions -->
-    <color name="card_action_negative_focused">#FFFBCBCA</color>
-    <color name="card_action_negative">#FFF64940</color>
-    <color name="card_action_negative_ripple">#CCF64940</color>
-
-    <!-- Positive Actions -->
-    <color name="card_action_positive_focused">#FFE4F0AF</color>
-    <color name="card_action_positive">#FFA0CC00</color>
-    <color name="card_action_positive_ripple">#CCA0CC00</color>
-</resources>

diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/build.gradle b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BatchStepSensor/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/BatchStepSensorFragment.java

diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/MainActivity.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/MainActivity.java
new file mode 100644
index 0000000..5745d13
--- /dev/null
+++ b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/MainActivity.java

@@ -0,0 +1,94 @@
+/*
+* 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.batchstepsensor;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.view.Menu;
+
+import com.example.android.common.activities.SampleActivityBase;
+import com.example.android.common.logger.Log;
+
+import com.example.android.batchstepsensor.cardstream.CardStream;
+import com.example.android.batchstepsensor.cardstream.CardStreamFragment;
+import com.example.android.batchstepsensor.cardstream.CardStreamState;
+import com.example.android.batchstepsensor.cardstream.OnCardClickListener;
+import com.example.android.batchstepsensor.cardstream.StreamRetentionFragment;
+
+public class MainActivity extends SampleActivityBase implements CardStream {
+    public static final String TAG = "MainActivity";
+    public static final String FRAGTAG = "BatchStepSensorFragment";
+
+    private CardStreamFragment mCardStreamFragment;
+
+    private StreamRetentionFragment mRetentionFragment;
+    private static final String RETENTION_TAG = "retention";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        FragmentManager fm = getSupportFragmentManager();
+        BatchStepSensorFragment fragment =
+                (BatchStepSensorFragment) fm.findFragmentByTag(FRAGTAG);
+
+        if (fragment == null) {
+            FragmentTransaction transaction = fm.beginTransaction();
+            fragment = new BatchStepSensorFragment();
+            transaction.add(fragment, FRAGTAG);
+            transaction.commit();
+        }
+
+        // Use fragment as click listener for cards, but must implement correct interface
+        if(!(fragment instanceof OnCardClickListener)){
+            throw new ClassCastException("BatchStepSensorFragment must " +
+                    "implement OnCardClickListener interface.");
+        }
+        OnCardClickListener clickListener = (OnCardClickListener) fm.findFragmentByTag(FRAGTAG);
+
+        mRetentionFragment = (StreamRetentionFragment) fm.findFragmentByTag(RETENTION_TAG);
+        if (mRetentionFragment == null) {
+            mRetentionFragment = new StreamRetentionFragment();
+            fm.beginTransaction().add(mRetentionFragment, RETENTION_TAG).commit();
+        } else {
+            // If the retention fragment already existed, we need to pull some state.
+            // pull state out
+            CardStreamState state = mRetentionFragment.getCardStream();
+
+            // dump it in CardStreamFragment.
+            mCardStreamFragment =
+                    (CardStreamFragment) fm.findFragmentById(R.id.fragment_cardstream);
+            mCardStreamFragment.restoreState(state, clickListener);
+        }
+    }
+
+    public CardStreamFragment getCardStream() {
+        if (mCardStreamFragment == null) {
+            mCardStreamFragment = (CardStreamFragment)
+                    getSupportFragmentManager().findFragmentById(R.id.fragment_cardstream);
+        }
+        return mCardStreamFragment;
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        CardStreamState state = getCardStream().dumpState();
+        mRetentionFragment.storeCardStream(state);
+    }
+}

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/Card.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/Card.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/Card.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/Card.java

diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardActionButton.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardActionButton.java
new file mode 100644
index 0000000..d063208
--- /dev/null
+++ b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardActionButton.java

@@ -0,0 +1,66 @@
+/*
+* 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.batchstepsensor.cardstream;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.animation.BounceInterpolator;
+import android.view.animation.DecelerateInterpolator;
+import android.widget.Button;
+
+/**
+ * Custom Button with a special 'pressed' effect for touch events.
+ */
+public class CardActionButton extends Button {
+
+    public CardActionButton(Context context) {
+        super(context);
+    }
+
+    public CardActionButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CardActionButton(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+
+        switch(event.getAction()){
+            case MotionEvent.ACTION_DOWN:
+                setPressed(true);
+                animate().scaleX(0.98f).scaleY(0.98f).alpha(0.8f).setDuration(100).
+                        setInterpolator(new DecelerateInterpolator());
+                break;
+            case MotionEvent.ACTION_UP:
+                animate().scaleX(1.0f).scaleY(1.f).alpha(1.0f).setDuration(50).
+                        setInterpolator(new BounceInterpolator());
+                break;
+            case MotionEvent.ACTION_CANCEL:
+                animate().scaleX(1.0f).scaleY(1.f).alpha(1.0f).setDuration(50).
+                        setInterpolator(new BounceInterpolator());
+                break;
+        }
+
+        return super.onTouchEvent(event);
+    }
+
+}
+

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardLayout.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardLayout.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardLayout.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardLayout.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStream.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStream.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStream.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStream.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamAnimator.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamAnimator.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamAnimator.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamAnimator.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamFragment.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamFragment.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamFragment.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamFragment.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamLinearLayout.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamLinearLayout.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamLinearLayout.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamLinearLayout.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamState.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamState.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamState.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/CardStreamState.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/DefaultCardStreamAnimator.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/DefaultCardStreamAnimator.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/DefaultCardStreamAnimator.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/DefaultCardStreamAnimator.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/OnCardClickListener.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/OnCardClickListener.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/OnCardClickListener.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/OnCardClickListener.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/StreamRetentionFragment.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/StreamRetentionFragment.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/batchstepsensor/cardstream/StreamRetentionFragment.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/batchstepsensor/cardstream/StreamRetentionFragment.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/ic_action_cancel.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/ic_action_cancel.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/ic_action_cancel.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-mdpi/ic_action_cancel.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-mdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-mdpi/ic_action_cancel.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-mdpi/ic_action_cancel.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/card_bg.9.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/card_bg.9.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/card_bg.9.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/card_bg.9.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_negative.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_negative.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_negative.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_negative.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_negative_pressed.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_negative_pressed.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_negative_pressed.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_negative_pressed.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_neutral.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_neutral.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_neutral.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_neutral.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_neutral_pressed.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_neutral_pressed.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_neutral_pressed.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_neutral_pressed.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_positive.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_positive.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_positive.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_positive.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_positive_pressed.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_positive_pressed.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_cardaction_positive_pressed.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_cardaction_positive_pressed.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xxhdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xxhdpi/ic_action_cancel.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xxhdpi/ic_action_cancel.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg_negative.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg_negative.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg_negative.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg_negative.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg_positive.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg_positive.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_bg_positive.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_bg_positive.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_negative.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_negative.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_negative.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_negative.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_neutral.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_neutral.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_neutral.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_neutral.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_positive.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_positive.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_icon_positive.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_icon_positive.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text_negative.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text_negative.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text_negative.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text_negative.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text_positive.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text_positive.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_action_text_positive.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_action_text_positive.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_overlay_focused.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_overlay_focused.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_overlay_focused.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_overlay_focused.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_separator.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_separator.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/drawable/card_separator.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/drawable/card_separator.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_negative.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_negative.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_negative.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_negative.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_neutral.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_neutral.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_neutral.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_neutral.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_positive.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_positive.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_positive.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_positive.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_seperator.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_seperator.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_button_seperator.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_button_seperator.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_progress.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_progress.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/card_progress.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/card_progress.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/cardstream.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/cardstream.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/layout/cardstream.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/layout/cardstream.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-sw720dp-land/dimens.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v11/styles.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v11/styles.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v14/styles.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v14/styles.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v16/styles.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v16/styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values-v16/styles.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values-v16/styles.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/attrs.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/attrs.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/attrs.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/attrs.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/color.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/color.xml
new file mode 100644
index 0000000..98717d8
--- /dev/null
+++ b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/color.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="card_action_inverted">@android:color/white</color>
+
+    <color name="card_content_textcolor">#444</color>
+
+    <color name="card_action_bg">#DDD</color>
+    <color name="card_action_item_bg">#F4F4F4</color>
+
+    <!-- Neutral Actions -->
+    <color name="card_action_focused">#FFE3F4FC</color>
+    <color name="card_action">#FF47B4EA</color>
+
+    <!-- Negative Actions -->
+    <color name="card_action_negative_focused">#FFFBCBCA</color>
+    <color name="card_action_negative">#FFF64940</color>
+
+    <!-- Positive Actions -->
+    <color name="card_action_positive_focused">#FFE4F0AF</color>
+    <color name="card_action_positive">#FFA0CC00</color>
+</resources>
\ No newline at end of file

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/ids.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/ids.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/ids.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/ids.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/styles.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BatchStepSensor/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BatchStepSensor/BatchStepSensorSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BatchStepSensor/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BatchStepSensor/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BatchStepSensor/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BatchStepSensor/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BatchStepSensor/settings.gradle b/prebuilts/gradle/BatchStepSensor/settings.gradle
index 9464a35..18ebefc 100644
--- a/prebuilts/gradle/BatchStepSensor/settings.gradle
+++ b/prebuilts/gradle/BatchStepSensor/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BatchStepSensorSample'

diff --git a/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/build.gradle b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BluetoothLeGatt/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/BluetoothLeService.java

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceControlActivity.java

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/DeviceScanActivity.java

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/java/com/example/android/bluetoothlegatt/SampleGattAttributes.java

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/actionbar_indeterminate_progress.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/actionbar_indeterminate_progress.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/actionbar_indeterminate_progress.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/actionbar_indeterminate_progress.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/gatt_services_characteristics.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/gatt_services_characteristics.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/gatt_services_characteristics.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/gatt_services_characteristics.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/listitem_device.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/listitem_device.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/layout/listitem_device.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/layout/listitem_device.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/menu/gatt_services.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/gatt_services.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/menu/gatt_services.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/gatt_services.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/menu/main.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BluetoothLeGatt/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BluetoothLeGatt/BluetoothLeGattSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BluetoothLeGatt/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BluetoothLeGatt/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BluetoothLeGatt/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BluetoothLeGatt/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BluetoothLeGatt/settings.gradle b/prebuilts/gradle/BluetoothLeGatt/settings.gradle
index 9464a35..05cae43 100644
--- a/prebuilts/gradle/BluetoothLeGatt/settings.gradle
+++ b/prebuilts/gradle/BluetoothLeGatt/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BluetoothLeGattSample'

diff --git a/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/BorderlessButtons/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/borderlessbuttons/MainActivity.java b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/borderlessbuttons/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/borderlessbuttons/MainActivity.java
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/borderlessbuttons/MainActivity.java

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_action_delete.png b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_action_delete.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_action_delete.png
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_action_delete.png
Binary files differ

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_action_delete.png b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_action_delete.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_action_delete.png
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_action_delete.png
Binary files differ

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_action_delete.png b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_action_delete.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_action_delete.png
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_action_delete.png
Binary files differ

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/list_item.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/list_item.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/list_item.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/list_item.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/menu/main.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/strings.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/styles.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/BorderlessButtons/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/BorderlessButtons/BorderlessButtonsSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/BorderlessButtons/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/BorderlessButtons/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/BorderlessButtons/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/BorderlessButtons/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/BorderlessButtons/settings.gradle b/prebuilts/gradle/BorderlessButtons/settings.gradle
index 9464a35..f5220c4 100644
--- a/prebuilts/gradle/BorderlessButtons/settings.gradle
+++ b/prebuilts/gradle/BorderlessButtons/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'BorderlessButtonsSample'

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/Camera2Basic/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 9a7579e..0000000
--- a/prebuilts/gradle/Camera2Basic/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,29 +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">Camera2Basic</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            This sample demonstrates the basic use of Camera2 API. Check the source code to see how
-            you can display camera preview and take pictures.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/Camera2Basic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/Camera2Basic/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 8b29c81..0000000
--- a/prebuilts/gradle/Camera2Basic/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.camera2basic.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.camera2basic"
-            android:label="Tests for com.example.android.camera2basic" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/Camera2Basic/CONTRIB.md b/prebuilts/gradle/Camera2Basic/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/Camera2Basic/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/Camera2Basic/Camera2BasicSample/build.gradle b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/build.gradle
new file mode 100644
index 0000000..d74a6db
--- /dev/null
+++ b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/build.gradle

@@ -0,0 +1,66 @@
+
+
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+repositories {
+    jcenter()
+}
+
+
+dependencies {
+
+
+
+}
+
+// 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 "android-L"
+
+    buildToolsVersion "19.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/Camera2Basic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/AutoFitTextureView.java b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/AutoFitTextureView.java
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/AutoFitTextureView.java
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/AutoFitTextureView.java

diff --git a/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
new file mode 100644
index 0000000..d3c2f1f
--- /dev/null
+++ b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java

@@ -0,0 +1,502 @@
+/*
+ * 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.camera2basic;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.ImageFormat;
+import android.graphics.Matrix;
+import android.graphics.RectF;
+import android.graphics.SurfaceTexture;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.TotalCaptureResult;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.media.Image;
+import android.media.ImageReader;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.util.Size;
+import android.util.SparseIntArray;
+import android.view.LayoutInflater;
+import android.view.Surface;
+import android.view.TextureView;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class Camera2BasicFragment extends Fragment implements View.OnClickListener {
+
+    /**
+     * Conversion from screen rotation to JPEG orientation.
+     */
+    private static final SparseIntArray ORIENTATIONS = new SparseIntArray();
+
+    static {
+        ORIENTATIONS.append(Surface.ROTATION_0, 90);
+        ORIENTATIONS.append(Surface.ROTATION_90, 0);
+        ORIENTATIONS.append(Surface.ROTATION_180, 270);
+        ORIENTATIONS.append(Surface.ROTATION_270, 180);
+    }
+
+    /**
+     * An {@link AutoFitTextureView} for camera preview.
+     */
+    private AutoFitTextureView mTextureView;
+
+    /**
+     * A {@link CaptureRequest.Builder} for camera preview.
+     */
+    private CaptureRequest.Builder mPreviewBuilder;
+
+    /**
+     * A {@link CameraCaptureSession } for camera preview.
+     */
+    private CameraCaptureSession mPreviewSession;
+
+    /**
+     * A reference to the opened {@link CameraDevice}.
+     */
+    private CameraDevice mCameraDevice;
+
+    /**
+     * {@link TextureView.SurfaceTextureListener} handles several lifecycle events on a
+     * {@link TextureView}.
+     */
+    private TextureView.SurfaceTextureListener mSurfaceTextureListener
+            = new TextureView.SurfaceTextureListener() {
+
+        @Override
+        public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture,
+                                              int width, int height) {
+            configureTransform(width, height);
+            startPreview();
+        }
+
+        @Override
+        public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture,
+                                                int width, int height) {
+            configureTransform(width, height);
+            startPreview();
+        }
+
+        @Override
+        public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
+            return true;
+        }
+
+        @Override
+        public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
+        }
+
+    };
+
+    /**
+     * The {@link android.util.Size} of camera preview.
+     */
+    private Size mPreviewSize;
+
+    /**
+     * True if the app is currently trying to open camera
+     */
+    private boolean mOpeningCamera;
+
+    /**
+     * {@link CameraDevice.StateListener} is called when {@link CameraDevice} changes its state.
+     */
+    private CameraDevice.StateListener mStateListener = new CameraDevice.StateListener() {
+
+        @Override
+        public void onOpened(CameraDevice cameraDevice) {
+            // This method is called when the camera is opened.  We start camera preview here.
+            mCameraDevice = cameraDevice;
+            startPreview();
+            mOpeningCamera = false;
+        }
+
+        @Override
+        public void onDisconnected(CameraDevice cameraDevice) {
+            cameraDevice.close();
+            mCameraDevice = null;
+            mOpeningCamera = false;
+        }
+
+        @Override
+        public void onError(CameraDevice cameraDevice, int error) {
+            cameraDevice.close();
+            mCameraDevice = null;
+            Activity activity = getActivity();
+            if (null != activity) {
+                activity.finish();
+            }
+            mOpeningCamera = false;
+        }
+
+    };
+
+    public static Camera2BasicFragment newInstance() {
+        Camera2BasicFragment fragment = new Camera2BasicFragment();
+        fragment.setRetainInstance(true);
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_camera2_basic, container, false);
+    }
+
+    @Override
+    public void onViewCreated(final View view, Bundle savedInstanceState) {
+        mTextureView = (AutoFitTextureView) view.findViewById(R.id.texture);
+        mTextureView.setSurfaceTextureListener(mSurfaceTextureListener);
+        view.findViewById(R.id.picture).setOnClickListener(this);
+        view.findViewById(R.id.info).setOnClickListener(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        openCamera();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (null != mCameraDevice) {
+            mCameraDevice.close();
+            mCameraDevice = null;
+        }
+    }
+
+    /**
+     * Opens a {@link CameraDevice}. The result is listened by `mStateListener`.
+     */
+    private void openCamera() {
+        Activity activity = getActivity();
+        if (null == activity || activity.isFinishing() || mOpeningCamera) {
+            return;
+        }
+        mOpeningCamera = true;
+        CameraManager manager = (CameraManager) activity.getSystemService(Context.CAMERA_SERVICE);
+        try {
+            String cameraId = manager.getCameraIdList()[0];
+
+            // To get a list of available sizes of camera preview, we retrieve an instance of
+            // StreamConfigurationMap from CameraCharacteristics
+            CameraCharacteristics characteristics = manager.getCameraCharacteristics(cameraId);
+            StreamConfigurationMap map = characteristics
+                    .get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+            mPreviewSize = map.getOutputSizes(SurfaceTexture.class)[0];
+
+            // We fit the aspect ratio of TextureView to the size of preview we picked.
+            int orientation = getResources().getConfiguration().orientation;
+            if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+                mTextureView.setAspectRatio(mPreviewSize.getWidth(), mPreviewSize.getHeight());
+            } else {
+                mTextureView.setAspectRatio(mPreviewSize.getHeight(), mPreviewSize.getWidth());
+            }
+
+            // We are opening the camera with a listener. When it is ready, onOpened of
+            // mStateListener is called.
+            manager.openCamera(cameraId, mStateListener, null);
+        } catch (CameraAccessException e) {
+            Toast.makeText(activity, "Cannot access the camera.", Toast.LENGTH_SHORT).show();
+            activity.finish();
+        }
+    }
+
+    /**
+     * Starts the camera preview.
+     */
+    private void startPreview() {
+        if (null == mCameraDevice || !mTextureView.isAvailable() || null == mPreviewSize) {
+            return;
+        }
+        try {
+            SurfaceTexture texture = mTextureView.getSurfaceTexture();
+            assert texture != null;
+
+            // We configure the size of default buffer to be the size of camera preview we want.
+            texture.setDefaultBufferSize(mPreviewSize.getWidth(), mPreviewSize.getHeight());
+
+            // This is the output Surface we need to start preview.
+            Surface surface = new Surface(texture);
+
+            // We set up a CaptureRequest.Builder with the output Surface.
+            mPreviewBuilder = mCameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+            mPreviewBuilder.addTarget(surface);
+
+            // Here, we create a CameraCaptureSession for camera preview.
+            mCameraDevice.createCaptureSession(Arrays.asList(surface),
+                    new CameraCaptureSession.StateListener() {
+
+                        @Override
+                        public void onConfigured(CameraCaptureSession cameraCaptureSession) {
+                            // When the session is ready, we start displaying the preview.
+                            mPreviewSession = cameraCaptureSession;
+                            updatePreview();
+                        }
+
+                        @Override
+                        public void onConfigureFailed(CameraCaptureSession cameraCaptureSession) {
+                            Activity activity = getActivity();
+                            if (null != activity) {
+                                Toast.makeText(activity, "Failed", Toast.LENGTH_SHORT).show();
+                            }
+                        }
+                    }, null
+            );
+        } catch (CameraAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * Updates the camera preview. {@link #startPreview()} needs to be called in advance.
+     */
+    private void updatePreview() {
+        if (null == mCameraDevice) {
+            return;
+        }
+        try {
+            // The camera preview can be run in a background thread. This is a Handler for camera
+            // preview.
+            setUpCaptureRequestBuilder(mPreviewBuilder);
+            HandlerThread thread = new HandlerThread("CameraPreview");
+            thread.start();
+            Handler backgroundHandler = new Handler(thread.getLooper());
+
+            // Finally, we start displaying the camera preview.
+            mPreviewSession.setRepeatingRequest(mPreviewBuilder.build(), null, backgroundHandler);
+        } catch (CameraAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Fills in parameters of the {@link CaptureRequest.Builder}.
+     *
+     * @param builder The builder for a {@link CaptureRequest}
+     */
+    private void setUpCaptureRequestBuilder(CaptureRequest.Builder builder) {
+        // In this sample, we just let the camera device pick the automatic settings.
+        builder.set(CaptureRequest.CONTROL_MODE, CameraMetadata.CONTROL_MODE_AUTO);
+    }
+
+    /**
+     * Configures the necessary {@link android.graphics.Matrix} transformation to `mTextureView`.
+     * This method should be called after the camera preview size is determined in openCamera and
+     * also the size of `mTextureView` is fixed.
+     *
+     * @param viewWidth  The width of `mTextureView`
+     * @param viewHeight The height of `mTextureView`
+     */
+    private void configureTransform(int viewWidth, int viewHeight) {
+        Activity activity = getActivity();
+        if (null == mTextureView || null == mPreviewSize || null == activity) {
+            return;
+        }
+        int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
+        Matrix matrix = new Matrix();
+        RectF viewRect = new RectF(0, 0, viewWidth, viewHeight);
+        RectF bufferRect = new RectF(0, 0, mPreviewSize.getHeight(), mPreviewSize.getWidth());
+        float centerX = viewRect.centerX();
+        float centerY = viewRect.centerY();
+        if (Surface.ROTATION_90 == rotation || Surface.ROTATION_270 == rotation) {
+            bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY());
+            matrix.setRectToRect(viewRect, bufferRect, Matrix.ScaleToFit.FILL);
+            float scale = Math.max(
+                    (float) viewHeight / mPreviewSize.getHeight(),
+                    (float) viewWidth / mPreviewSize.getWidth());
+            matrix.postScale(scale, scale, centerX, centerY);
+            matrix.postRotate(90 * (rotation - 2), centerX, centerY);
+        }
+        mTextureView.setTransform(matrix);
+    }
+
+    /**
+     * Takes a picture.
+     */
+    private void takePicture() {
+        try {
+            final Activity activity = getActivity();
+            if (null == activity || null == mCameraDevice) {
+                return;
+            }
+            CameraManager manager =
+                    (CameraManager) activity.getSystemService(Context.CAMERA_SERVICE);
+
+            // Pick the best JPEG size that can be captured with this CameraDevice.
+            CameraCharacteristics characteristics =
+                    manager.getCameraCharacteristics(mCameraDevice.getId());
+            Size[] jpegSizes = null;
+            if (characteristics != null) {
+                jpegSizes = characteristics
+                        .get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)
+                        .getOutputSizes(ImageFormat.JPEG);
+            }
+            int width = 640;
+            int height = 480;
+            if (jpegSizes != null && 0 < jpegSizes.length) {
+                width = jpegSizes[0].getWidth();
+                height = jpegSizes[0].getHeight();
+            }
+
+            // We use an ImageReader to get a JPEG from CameraDevice.
+            // Here, we create a new ImageReader and prepare its Surface as an output from camera.
+            ImageReader reader = ImageReader.newInstance(width, height, ImageFormat.JPEG, 1);
+            List<Surface> outputSurfaces = new ArrayList<Surface>(2);
+            outputSurfaces.add(reader.getSurface());
+            outputSurfaces.add(new Surface(mTextureView.getSurfaceTexture()));
+
+            // This is the CaptureRequest.Builder that we use to take a picture.
+            final CaptureRequest.Builder captureBuilder =
+                    mCameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+            captureBuilder.addTarget(reader.getSurface());
+            setUpCaptureRequestBuilder(captureBuilder);
+
+            // Orientation
+            int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
+            captureBuilder.set(CaptureRequest.JPEG_ORIENTATION, ORIENTATIONS.get(rotation));
+
+            // Output file
+            final File file = new File(activity.getExternalFilesDir(null), "pic.jpg");
+
+            // This listener is called when a image is ready in ImageReader
+            ImageReader.OnImageAvailableListener readerListener =
+                    new ImageReader.OnImageAvailableListener() {
+                        @Override
+                        public void onImageAvailable(ImageReader reader) {
+                            Image image = null;
+                            try {
+                                image = reader.acquireLatestImage();
+                                ByteBuffer buffer = image.getPlanes()[0].getBuffer();
+                                byte[] bytes = new byte[buffer.capacity()];
+                                buffer.get(bytes);
+                                save(bytes);
+                            } catch (FileNotFoundException e) {
+                                e.printStackTrace();
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            } finally {
+                                if (image != null) {
+                                    image.close();
+                                }
+                            }
+                        }
+
+                        private void save(byte[] bytes) throws IOException {
+                            OutputStream output = null;
+                            try {
+                                output = new FileOutputStream(file);
+                                output.write(bytes);
+                            } finally {
+                                if (null != output) {
+                                    output.close();
+                                }
+                            }
+                        }
+                    };
+
+            // We create a Handler since we want to handle the result JPEG in a background thread
+            HandlerThread thread = new HandlerThread("CameraPicture");
+            thread.start();
+            final Handler backgroundHandler = new Handler(thread.getLooper());
+            reader.setOnImageAvailableListener(readerListener, backgroundHandler);
+
+            // This listener is called when the capture is completed.
+            // Note that the JPEG data is not available in this listener, but in the
+            // ImageReader.OnImageAvailableListener we created above.
+            final CameraCaptureSession.CaptureListener captureListener =
+                    new CameraCaptureSession.CaptureListener() {
+
+                        @Override
+                        public void onCaptureCompleted(CameraCaptureSession session,
+                                                       CaptureRequest request,
+                                                       TotalCaptureResult result) {
+                            Toast.makeText(activity, "Saved: " + file, Toast.LENGTH_SHORT).show();
+                            // We restart the preview when the capture is completed
+                            startPreview();
+                        }
+
+                    };
+
+            // Finally, we can start a new CameraCaptureSession to take a picture.
+            mCameraDevice.createCaptureSession(outputSurfaces,
+                    new CameraCaptureSession.StateListener() {
+                        @Override
+                        public void onConfigured(CameraCaptureSession session) {
+                            try {
+                                session.capture(captureBuilder.build(), captureListener,
+                                        backgroundHandler);
+                            } catch (CameraAccessException e) {
+                                e.printStackTrace();
+                            }
+                        }
+
+                        @Override
+                        public void onConfigureFailed(CameraCaptureSession session) {
+                        }
+                    }, backgroundHandler
+            );
+        } catch (CameraAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.picture: {
+                takePicture();
+                break;
+            }
+            case R.id.info: {
+                Activity activity = getActivity();
+                if (null != activity) {
+                    new AlertDialog.Builder(activity)
+                            .setMessage(R.string.intro_message)
+                            .setPositiveButton(android.R.string.ok, null)
+                            .show();
+                }
+                break;
+            }
+        }
+    }
+
+}

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/CameraActivity.java b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/CameraActivity.java
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/CameraActivity.java
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/java/com/example/android/camera2basic/CameraActivity.java

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-hdpi/ic_action_info.png b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-hdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-hdpi/ic_action_info.png
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-hdpi/ic_action_info.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-mdpi/ic_action_info.png b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-mdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-mdpi/ic_action_info.png
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-mdpi/ic_action_info.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-xhdpi/ic_action_info.png b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xhdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-xhdpi/ic_action_info.png
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xhdpi/ic_action_info.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-xxhdpi/ic_action_info.png b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xxhdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-xxhdpi/ic_action_info.png
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xxhdpi/ic_action_info.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout-land/fragment_camera2_basic.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/layout-land/fragment_camera2_basic.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/layout-land/fragment_camera2_basic.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/layout-land/fragment_camera2_basic.xml

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/activity_camera.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/layout/activity_camera.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/activity_camera.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/layout/activity_camera.xml

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/fragment_camera2_basic.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/layout/fragment_camera2_basic.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/layout/fragment_camera2_basic.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/layout/fragment_camera2_basic.xml

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values/base-strings.xml
new file mode 100644
index 0000000..bb68652
--- /dev/null
+++ b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values/base-strings.xml

@@ -0,0 +1,32 @@
+<?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">Camera2Basic</string>
+    <string name="intro_message">
+        <![CDATA[
+        
+            
+            This sample demonstrates the basic use of Camera2 API. Check the source code to see how
+            you can display camera preview and take pictures.
+            
+        
+        ]]>
+    </string>
+</resources>

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/values/strings.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/values/styles.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/Camera2Basic/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/Camera2Basic/Camera2BasicSample/tests/AndroidManifest.xml b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..7196a85
--- /dev/null
+++ b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/tests/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?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
+
+  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.camera2basic.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.camera2basic"
+            android:label="Tests for com.example.android.camera2basic" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/Camera2Basic/Application/tests/src/com/example/android/camera2basic/tests/SampleTests.java b/prebuilts/gradle/Camera2Basic/Camera2BasicSample/tests/src/com/example/android/camera2basic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/Camera2Basic/Application/tests/src/com/example/android/camera2basic/tests/SampleTests.java
rename to prebuilts/gradle/Camera2Basic/Camera2BasicSample/tests/src/com/example/android/camera2basic/tests/SampleTests.java

diff --git a/prebuilts/gradle/Camera2Basic/LICENSE b/prebuilts/gradle/Camera2Basic/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/Camera2Basic/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/Camera2Basic/README.md b/prebuilts/gradle/Camera2Basic/README.md
deleted file mode 100644
index 73b9eac..0000000
--- a/prebuilts/gradle/Camera2Basic/README.md
+++ /dev/null

@@ -1,50 +0,0 @@
-Android Camera2Basic Sample
-==============================
-
-This sample demonstrates the basic use of Camera2 API. Check the source code to see how you can
-display camera preview and take pictures.
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-Camera2Basic
-
-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
-
-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/Camera2Basic/README.txt b/prebuilts/gradle/Camera2Basic/README.txt
new file mode 100644
index 0000000..9616c58
--- /dev/null
+++ b/prebuilts/gradle/Camera2Basic/README.txt

@@ -0,0 +1,18 @@
+Build Instructions
+-------------------
+
+This sample uses the Gradle build system. To build this project, use the
+"gradlew build" command or use "Import Project" in Android Studio.
+
+To see a list of all available commands, run "gradlew tasks".
+
+Dependencies
+-------------
+
+- Android SDK Build-tools v18.1
+- Android Support Repository v2
+
+Dependencies are available for download via the Android SDK Manager.
+
+Android Studio is available for download at:
+    http://developer.android.com/sdk/installing/studio.html

diff --git a/prebuilts/gradle/Camera2Basic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/Camera2Basic/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/Camera2Basic/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/Camera2Basic/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/Camera2Basic/packaging.yaml b/prebuilts/gradle/Camera2Basic/packaging.yaml
deleted file mode 100644
index d0327da..0000000
--- a/prebuilts/gradle/Camera2Basic/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:   [Media]
-languages:    [Java]
-solutions:    [Mobile]
-github:       googlesamples/android-Camera2Basic
-level:        BEGINNER
-icon:         Camera2BasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2

diff --git a/prebuilts/gradle/Camera2Basic/settings.gradle b/prebuilts/gradle/Camera2Basic/settings.gradle
index 9464a35..fcefe51 100644
--- a/prebuilts/gradle/Camera2Basic/settings.gradle
+++ b/prebuilts/gradle/Camera2Basic/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'Camera2BasicSample'

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/Camera2Video/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 08388de..0000000
--- a/prebuilts/gradle/Camera2Video/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">Camera2Video</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            This sample demonstrates how to record video using Camera2 API.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/Camera2Video/CONTRIB.md b/prebuilts/gradle/Camera2Video/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/Camera2Video/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/Camera2Video/Camera2VideoSample/build.gradle b/prebuilts/gradle/Camera2Video/Camera2VideoSample/build.gradle
new file mode 100644
index 0000000..d74a6db
--- /dev/null
+++ b/prebuilts/gradle/Camera2Video/Camera2VideoSample/build.gradle

@@ -0,0 +1,66 @@
+
+
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+repositories {
+    jcenter()
+}
+
+
+dependencies {
+
+
+
+}
+
+// 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 "android-L"
+
+    buildToolsVersion "19.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/Camera2Video/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/java/com/example/android/camera2video/AutoFitTextureView.java b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/AutoFitTextureView.java
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/java/com/example/android/camera2video/AutoFitTextureView.java
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/AutoFitTextureView.java

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/java/com/example/android/camera2video/CameraActivity.java b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/CameraActivity.java
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/java/com/example/android/camera2video/CameraActivity.java
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/java/com/example/android/camera2video/CameraActivity.java

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-hdpi/ic_action_info.png b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-hdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-hdpi/ic_action_info.png
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-hdpi/ic_action_info.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-mdpi/ic_action_info.png b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-mdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-mdpi/ic_action_info.png
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-mdpi/ic_action_info.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-xhdpi/ic_action_info.png b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-xhdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-xhdpi/ic_action_info.png
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-xhdpi/ic_action_info.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-xxhdpi/ic_action_info.png b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-xxhdpi/ic_action_info.png
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-xxhdpi/ic_action_info.png
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-xxhdpi/ic_action_info.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/layout-land/fragment_camera2_video.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/layout-land/fragment_camera2_video.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/layout-land/fragment_camera2_video.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/layout-land/fragment_camera2_video.xml

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/layout/activity_camera.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/layout/activity_camera.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/layout/activity_camera.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/layout/activity_camera.xml

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/layout/fragment_camera2_video.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/layout/fragment_camera2_video.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/layout/fragment_camera2_video.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/layout/fragment_camera2_video.xml

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values/base-strings.xml
new file mode 100644
index 0000000..1d99811
--- /dev/null
+++ b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values/base-strings.xml

@@ -0,0 +1,31 @@
+<?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">Camera2Video</string>
+    <string name="intro_message">
+        <![CDATA[
+        
+            
+            This sample demonstrates how to record video using Camera2 API.
+            
+        
+        ]]>
+    </string>
+</resources>

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/values/strings.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/values/styles.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/Camera2Video/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/Camera2Video/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/Camera2Video/Camera2VideoSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/Camera2Video/LICENSE b/prebuilts/gradle/Camera2Video/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/Camera2Video/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/Camera2Video/README.md b/prebuilts/gradle/Camera2Video/README.md
deleted file mode 100644
index 543d7cd..0000000
--- a/prebuilts/gradle/Camera2Video/README.md
+++ /dev/null

@@ -1,49 +0,0 @@
-Android Camera2Video Sample
-==============================
-
-This sample demonstrates how to record video using Camera2 API.
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-Camera2Video
-
-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/Camera2Video/README.txt b/prebuilts/gradle/Camera2Video/README.txt
new file mode 100644
index 0000000..9616c58
--- /dev/null
+++ b/prebuilts/gradle/Camera2Video/README.txt

@@ -0,0 +1,18 @@
+Build Instructions
+-------------------
+
+This sample uses the Gradle build system. To build this project, use the
+"gradlew build" command or use "Import Project" in Android Studio.
+
+To see a list of all available commands, run "gradlew tasks".
+
+Dependencies
+-------------
+
+- Android SDK Build-tools v18.1
+- Android Support Repository v2
+
+Dependencies are available for download via the Android SDK Manager.
+
+Android Studio is available for download at:
+    http://developer.android.com/sdk/installing/studio.html

diff --git a/prebuilts/gradle/Camera2Video/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/Camera2Video/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/Camera2Video/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/Camera2Video/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/Camera2Video/packaging.yaml b/prebuilts/gradle/Camera2Video/packaging.yaml
deleted file mode 100644
index 26270dc..0000000
--- a/prebuilts/gradle/Camera2Video/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:   [Media]
-languages:    [Java]
-solutions:    [Mobile]
-github:       googlesamples/android-Camera2Video
-level:        BEGINNER
-icon:         Camera2VideoSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2

diff --git a/prebuilts/gradle/Camera2Video/settings.gradle b/prebuilts/gradle/Camera2Video/settings.gradle
index 9464a35..890bae1 100644
--- a/prebuilts/gradle/Camera2Video/settings.gradle
+++ b/prebuilts/gradle/Camera2Video/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'Camera2VideoSample'

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/MainActivity.java b/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/MainActivity.java
deleted file mode 100644
index af0b9f3..0000000
--- a/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/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.cardemulation;
-
-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();
-            CardEmulationFragment fragment = new CardEmulationFragment();
-            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/CardEmulation/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/CardEmulation/Application/src/main/res/values/fragmentview_strings.xml
deleted file mode 100755
index 7b9d9ec..0000000
--- a/prebuilts/gradle/CardEmulation/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/CardEmulation/Application/tests/AndroidManifest.xml b/prebuilts/gradle/CardEmulation/Application/tests/AndroidManifest.xml
deleted file mode 100644
index d1ec341..0000000
--- a/prebuilts/gradle/CardEmulation/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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="${sample.package}.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.cardemulation"
-            android:label="Tests for com.example.android.cardemulation" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/build.gradle b/prebuilts/gradle/CardEmulation/CardEmulationSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/CardEmulation/CardEmulationSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/CardEmulation/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/AccountStorage.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/AccountStorage.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/AccountStorage.java
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/AccountStorage.java

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardEmulationFragment.java

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardService.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardService.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardService.java
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/CardService.java

diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/MainActivity.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/MainActivity.java
new file mode 100644
index 0000000..19abe36
--- /dev/null
+++ b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/cardemulation/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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.cardemulation;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        CardEmulationFragment fragment = new CardEmulationFragment();
+        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/CardEmulation/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xxhdpi/card_background.png b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/card_background.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xxhdpi/card_background.png
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/card_background.png
Binary files differ

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/layout/main_fragment.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout/main_fragment.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/layout/main_fragment.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/layout/main_fragment.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/menu/main.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/values/strings.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/CardEmulation/Application/src/main/res/xml/aid_list.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/xml/aid_list.xml
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/src/main/res/xml/aid_list.xml
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/src/main/res/xml/aid_list.xml

diff --git a/prebuilts/gradle/CardEmulation/CardEmulationSample/tests/AndroidManifest.xml b/prebuilts/gradle/CardEmulation/CardEmulationSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..447d041
--- /dev/null
+++ b/prebuilts/gradle/CardEmulation/CardEmulationSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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="${sample.package}.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="19"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.cardemulation"
+            android:label="Tests for com.example.android.cardemulation" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/CardEmulation/Application/tests/src/com/example/android/cardemulation/tests/SampleTests.java b/prebuilts/gradle/CardEmulation/CardEmulationSample/tests/src/com/example/android/cardemulation/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/CardEmulation/Application/tests/src/com/example/android/cardemulation/tests/SampleTests.java
rename to prebuilts/gradle/CardEmulation/CardEmulationSample/tests/src/com/example/android/cardemulation/tests/SampleTests.java

diff --git a/prebuilts/gradle/CardEmulation/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/CardEmulation/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/CardEmulation/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/CardEmulation/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/CardEmulation/settings.gradle b/prebuilts/gradle/CardEmulation/settings.gradle
index 9464a35..32b4942 100644
--- a/prebuilts/gradle/CardEmulation/settings.gradle
+++ b/prebuilts/gradle/CardEmulation/settings.gradle

@@ -1 +1 @@
-include 'Application'
+include 'CardEmulationSample'

diff --git a/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/MainActivity.java b/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/MainActivity.java
deleted file mode 100644
index ac6327d..0000000
--- a/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/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.cardreader;
-
-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();
-            CardReaderFragment fragment = new CardReaderFragment();
-            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/CardReader/Application/tests/AndroidManifest.xml b/prebuilts/gradle/CardReader/Application/tests/AndroidManifest.xml
deleted file mode 100644
index fd702fc..0000000
--- a/prebuilts/gradle/CardReader/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.cardreader.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.cardreader"
-            android:label="Tests for com.example.android.cardreader" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/CardReader/CardReaderSample/build.gradle b/prebuilts/gradle/CardReader/CardReaderSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/CardReader/CardReaderSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/CardReader/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/CardReaderFragment.java b/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/CardReaderFragment.java
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/CardReaderFragment.java
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/CardReaderFragment.java

diff --git a/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java b/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/LoyaltyCardReader.java

diff --git a/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/MainActivity.java b/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/MainActivity.java
new file mode 100644
index 0000000..bca1aea
--- /dev/null
+++ b/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/cardreader/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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.cardreader;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        CardReaderFragment fragment = new CardReaderFragment();
+        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/CardReader/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/drawable-xxhdpi/card_background.png b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/card_background.png
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/drawable-xxhdpi/card_background.png
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/card_background.png
Binary files differ

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/layout/main_fragment.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout/main_fragment.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/layout/main_fragment.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/layout/main_fragment.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/menu/main.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/values/strings.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/CardReader/Application/src/main/res/xml/nfc_tech_filter.xml b/prebuilts/gradle/CardReader/CardReaderSample/src/main/res/xml/nfc_tech_filter.xml
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/src/main/res/xml/nfc_tech_filter.xml
rename to prebuilts/gradle/CardReader/CardReaderSample/src/main/res/xml/nfc_tech_filter.xml

diff --git a/prebuilts/gradle/CardReader/CardReaderSample/tests/AndroidManifest.xml b/prebuilts/gradle/CardReader/CardReaderSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..1098859
--- /dev/null
+++ b/prebuilts/gradle/CardReader/CardReaderSample/tests/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?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
+
+  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.cardreader.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="19"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.cardreader"
+            android:label="Tests for com.example.android.cardreader" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/CardReader/Application/tests/src/com/example/android/cardreader/tests/SampleTests.java b/prebuilts/gradle/CardReader/CardReaderSample/tests/src/com/example/android/cardreader/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/CardReader/Application/tests/src/com/example/android/cardreader/tests/SampleTests.java
rename to prebuilts/gradle/CardReader/CardReaderSample/tests/src/com/example/android/cardreader/tests/SampleTests.java

diff --git a/prebuilts/gradle/CardReader/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/CardReader/gradle/wrapper/gradle-wrapper.properties
index a7bd4a7..f040b45 100644
--- a/prebuilts/gradle/CardReader/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/CardReader/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip

diff --git a/prebuilts/gradle/CardReader/settings.gradle b/prebuilts/gradle/CardReader/settings.gradle
index 9464a35..d1d7333 100644
--- a/prebuilts/gradle/CardReader/settings.gradle
+++ b/prebuilts/gradle/CardReader/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'CardReaderSample'

diff --git a/prebuilts/gradle/CardView/Application/build.gradle b/prebuilts/gradle/CardView/Application/build.gradle
deleted file mode 100644
index 0fc8a01..0000000
--- a/prebuilts/gradle/CardView/Application/build.gradle
+++ /dev/null

@@ -1,68 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-repositories {
-    jcenter()
-}
-
-
-dependencies {
-
-
-    compile "com.android.support:cardview-v7:21.+"
-}
-
-// 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.0.0"
-
-    defaultConfig {
-        minSdkVersion 21
-        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/CardView/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/CardView/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 6c4a9d9..0000000
--- a/prebuilts/gradle/CardView/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.cardview"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk android:minSdkVersion="7"
-              android:targetSdkVersion="21" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name=".CardViewActivity"
-            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/CardView/Application/src/main/java/com/example/android/cardview/CardViewActivity.java b/prebuilts/gradle/CardView/Application/src/main/java/com/example/android/cardview/CardViewActivity.java
deleted file mode 100644
index 0153f56..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/java/com/example/android/cardview/CardViewActivity.java
+++ /dev/null

@@ -1,37 +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.cardview;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-/**
- * Launcher Activity for the CardView sample app.
- */
-public class CardViewActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_card_view);
-        if (savedInstanceState == null) {
-            getFragmentManager().beginTransaction()
-                    .add(R.id.container, CardViewFragment.newInstance())
-                    .commit();
-        }
-    }
-}

diff --git a/prebuilts/gradle/CardView/Application/src/main/java/com/example/android/cardview/CardViewFragment.java b/prebuilts/gradle/CardView/Application/src/main/java/com/example/android/cardview/CardViewFragment.java
deleted file mode 100644
index 46ba6b0..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/java/com/example/android/cardview/CardViewFragment.java
+++ /dev/null

@@ -1,120 +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.cardview;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.support.v7.widget.CardView;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.SeekBar;
-
-/**
- * Fragment that demonstrates how to use CardView.
- */
-public class CardViewFragment extends Fragment {
-
-    private static final String TAG = CardViewFragment.class.getSimpleName();
-
-    /** The CardView widget. */
-    //@VisibleForTesting
-    CardView mCardView;
-
-    /**
-     * SeekBar that changes the cornerRadius attribute for the {@link #mCardView} widget.
-     */
-    //@VisibleForTesting
-    SeekBar mRadiusSeekBar;
-
-    /**
-     * SeekBar that changes the Elevation attribute for the {@link #mCardView} widget.
-     */
-    //@VisibleForTesting
-    SeekBar mElevationSeekBar;
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @return A new instance of fragment NotificationFragment.
-     */
-    public static CardViewFragment newInstance() {
-        CardViewFragment fragment = new CardViewFragment();
-        fragment.setRetainInstance(true);
-        return fragment;
-    }
-
-    public CardViewFragment() {
-        // Required empty public constructor
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_card_view, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        mCardView = (CardView) view.findViewById(R.id.cardview);
-        mRadiusSeekBar = (SeekBar) view.findViewById(R.id.cardview_radius_seekbar);
-        mRadiusSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                Log.d(TAG, String.format("SeekBar Radius progress : %d", progress));
-                mCardView.setRadius(progress);
-            }
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {
-                //Do nothing
-            }
-
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-                //Do nothing
-            }
-        });
-
-        mElevationSeekBar = (SeekBar) view.findViewById(R.id.cardview_elevation_seekbar);
-        mElevationSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                Log.d(TAG, String.format("SeekBar Elevation progress : %d", progress));
-                mCardView.setElevation(progress);
-            }
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {
-                //Do nothing
-            }
-
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-                //Do nothing
-            }
-        });
-    }
-}
-

diff --git a/prebuilts/gradle/CardView/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/CardView/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 36f4db5..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/CardView/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/CardView/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/CardView/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/CardView/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index f4ca065..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/CardView/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/CardView/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 6464a93..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/CardView/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/CardView/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 5a017ba..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/CardView/Application/src/main/res/layout/activity_card_view.xml b/prebuilts/gradle/CardView/Application/src/main/res/layout/activity_card_view.xml
deleted file mode 100644
index e32b7a6..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/layout/activity_card_view.xml
+++ /dev/null

@@ -1,27 +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:id="@+id/container"
-    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="com.example.android.cardview.CardViewActivity"
-    tools:ignore="MergeRootFrame" />

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/src/main/res/layout/fragment_card_view.xml b/prebuilts/gradle/CardView/Application/src/main/res/layout/fragment_card_view.xml
deleted file mode 100644
index 432c524..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/layout/fragment_card_view.xml
+++ /dev/null

@@ -1,91 +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
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    >
-
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:orientation="vertical"
-                  android:paddingBottom="@dimen/activity_vertical_margin"
-                  android:paddingTop="@dimen/activity_vertical_margin"
-                  android:paddingLeft="@dimen/activity_horizontal_margin"
-                  android:paddingRight="@dimen/activity_horizontal_margin"
-        >
-        <android.support.v7.widget.CardView
-            android:id="@+id/cardview"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:elevation="100dp"
-            card_view:cardBackgroundColor="@color/cardview_initial_background"
-            card_view:cardCornerRadius="8dp"
-            android:layout_marginLeft="@dimen/margin_large"
-            android:layout_marginRight="@dimen/margin_large"
-            >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/margin_medium"
-                android:text="@string/cardview_contents"
-                />
-        </android.support.v7.widget.CardView>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_large"
-            android:orientation="horizontal"
-            >
-            <TextView
-                android:layout_width="@dimen/seekbar_label_length"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/cardview_radius_seekbar_text"
-                />
-            <SeekBar
-                android:id="@+id/cardview_radius_seekbar"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/margin_medium"
-                />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            >
-            <TextView
-                android:layout_width="@dimen/seekbar_label_length"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/cardview_elevation_seekbar_text"
-                />
-            <SeekBar
-                android:id="@+id/cardview_elevation_seekbar"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/margin_medium"
-                />
-        </LinearLayout>
-    </LinearLayout>
-</ScrollView>
-

diff --git a/prebuilts/gradle/CardView/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/CardView/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/CardView/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/CardView/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/CardView/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/CardView/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/CardView/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/CardView/Application/src/main/res/values-v11/template-styles.xml
deleted file mode 100644
index 8c1ea66..0000000
--- a/prebuilts/gradle/CardView/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/CardView/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/CardView/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index d39c396..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,29 +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">CardView Sample</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            This sample demonstrates how to use CardView introduced in the support library for the
-            Android L preview.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/CardView/Application/src/main/res/values/colors.xml b/prebuilts/gradle/CardView/Application/src/main/res/values/colors.xml
deleted file mode 100644
index 71d15f7..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/values/colors.xml
+++ /dev/null

@@ -1,19 +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>
-    <color name="cardview_initial_background">#71C3DE</color>
-</resources>
\ No newline at end of file

diff --git a/prebuilts/gradle/CardView/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/CardView/Application/src/main/res/values/dimens.xml
deleted file mode 100644
index 9133662..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/values/dimens.xml
+++ /dev/null

@@ -1,22 +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>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="seekbar_label_length">70dp</dimen>
-</resources>

diff --git a/prebuilts/gradle/CardView/Application/src/main/res/values/strings.xml b/prebuilts/gradle/CardView/Application/src/main/res/values/strings.xml
deleted file mode 100644
index c995595..0000000
--- a/prebuilts/gradle/CardView/Application/src/main/res/values/strings.xml
+++ /dev/null

@@ -1,28 +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="title_activity_card_view">CardViewActivity</string>
-    <string name="cardview_contents">This is a CardView widget. CardView widgets can have
-        shadows and rounded corners.
-        \n\nTo create a card with a shadow, use the <font fgcolor="#FFFFFFFF">android:elevation</font>
-        attribute.
-        \n\nTo set the corner radius in your layouts, use the <font
-            fgcolor="#FFFFFFFF">card_view:cardCornerRadius</font> attribute.
-    </string>
-    <string name="cardview_radius_seekbar_text">Radius</string>
-    <string name="cardview_elevation_seekbar_text">Elevation</string>
-</resources>

diff --git a/prebuilts/gradle/CardView/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/CardView/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/CardView/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/CardView/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/CardView/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 6e7d593..0000000
--- a/prebuilts/gradle/CardView/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/CardView/Application/tests/AndroidManifest.xml b/prebuilts/gradle/CardView/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 92cfd40..0000000
--- a/prebuilts/gradle/CardView/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +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 name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest
-    package="com.example.android.cardview.tests"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    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:label="Tests for CardView sample"
-        android:targetPackage="com.example.android.cardview"/>
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/CardView/Application/tests/src/com/example/android/cardview/SampleTests.java b/prebuilts/gradle/CardView/Application/tests/src/com/example/android/cardview/SampleTests.java
deleted file mode 100644
index 87b2588..0000000
--- a/prebuilts/gradle/CardView/Application/tests/src/com/example/android/cardview/SampleTests.java
+++ /dev/null

@@ -1,70 +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.cardview;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * Unit tests for CardView samples.
- */
-public class SampleTests extends ActivityInstrumentationTestCase2<CardViewActivity> {
-
-    private CardViewActivity mActivity;
-    private CardViewFragment mFragment;
-
-    public SampleTests() {
-        super(CardViewActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mFragment = (CardViewFragment) mActivity.getFragmentManager().findFragmentById(R.id
-                .container);
-    }
-
-    public void testPreconditions() {
-        assertNotNull(String.format("%s is null", CardViewActivity.class.getSimpleName()),
-                mActivity);
-        assertNotNull(String.format("%s is null", CardViewFragment.class.getSimpleName()),
-                mFragment);
-        assertNotNull("SeekBar for Radius is null", mFragment.mRadiusSeekBar);
-        assertNotNull("SeekBar for Elevation is null", mFragment.mElevationSeekBar);
-    }
-
-    public void testRadiusSeekbarChangesRadiusOfCardView() {
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                float radius = 50.0f;
-                mFragment.mRadiusSeekBar.setProgress((int) radius);
-                assertEquals(radius, mFragment.mCardView.getRadius());
-            }
-        });
-    }
-
-    public void testElevationSeekbarChangesElevationOfCardView() {
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                float elevation = 40.0f;
-                mFragment.mElevationSeekBar.setProgress((int) elevation);
-                assertEquals(elevation, mFragment.mCardView.getElevation());
-            }
-        });
-    }
-}
\ No newline at end of file

diff --git a/prebuilts/gradle/CardView/CONTRIB.md b/prebuilts/gradle/CardView/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/CardView/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/CardView/LICENSE b/prebuilts/gradle/CardView/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/CardView/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/CardView/README.md b/prebuilts/gradle/CardView/README.md
deleted file mode 100644
index afa2483..0000000
--- a/prebuilts/gradle/CardView/README.md
+++ /dev/null

@@ -1,49 +0,0 @@
-Android CardView Sample
-=======================
-
-Demonstration of the CardView API introduced in Android L.
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-BasicAndroidKeyStore
-
-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/CardView/build.gradle b/prebuilts/gradle/CardView/build.gradle
deleted file mode 100644
index 5cf5d3d..0000000
--- a/prebuilts/gradle/CardView/build.gradle
+++ /dev/null

@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/prebuilts/gradle/CardView/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/CardView/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/gradle/CardView/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/CardView/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/CardView/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 588fabb..0000000
--- a/prebuilts/gradle/CardView/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-#Fri Aug 22 14:55:27 JST 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip

diff --git a/prebuilts/gradle/CardView/gradlew b/prebuilts/gradle/CardView/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/CardView/gradlew
+++ /dev/null

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/prebuilts/gradle/CardView/gradlew.bat b/prebuilts/gradle/CardView/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/prebuilts/gradle/CardView/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/CardView/packaging.yaml b/prebuilts/gradle/CardView/packaging.yaml
deleted file mode 100644
index 1dbd957..0000000
--- a/prebuilts/gradle/CardView/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:   [UI]
-languages:    [Java]
-solutions:    [Mobile]
-github:       googlesamples/android-CardView
-level:        INTERMEDIATE
-icon:         CardViewSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-doc_refs:
-    - android:preview/material/ui-widgets.html
-license: apache2

diff --git a/prebuilts/gradle/CardView/settings.gradle b/prebuilts/gradle/CardView/settings.gradle
deleted file mode 100644
index 9464a35..0000000
--- a/prebuilts/gradle/CardView/settings.gradle
+++ /dev/null

@@ -1 +0,0 @@
-include 'Application'

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/clippingbasic/MainActivity.java b/prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/clippingbasic/MainActivity.java
deleted file mode 100644
index fe290f9..0000000
--- a/prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/clippingbasic/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.clippingbasic;
-
-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();
-            ClippingBasicFragment fragment = new ClippingBasicFragment();
-            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/ClippingBasic/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/ClippingBasic/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 622c074..0000000
--- a/prebuilts/gradle/ClippingBasic/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">ClippingBasic</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            Basic sample to demonstrate clipping on a View.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/ClippingBasic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/ClippingBasic/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 28aa52a..0000000
--- a/prebuilts/gradle/ClippingBasic/Application/tests/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.
--->
-<!-- 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.clippingbasic.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.clippingbasic"
-            android:label="Tests for com.example.android.clippingbasic" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ClippingBasic/CONTRIB.md b/prebuilts/gradle/ClippingBasic/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/ClippingBasic/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/ClippingBasic/ClippingBasicSample/build.gradle b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/build.gradle
new file mode 100644
index 0000000..a0487e5
--- /dev/null
+++ b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/build.gradle

@@ -0,0 +1,62 @@
+
+
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 "android-L"
+
+    buildToolsVersion "19.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/ClippingBasic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/clippingbasic/ClippingBasicFragment.java b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/clippingbasic/ClippingBasicFragment.java
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/clippingbasic/ClippingBasicFragment.java
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/clippingbasic/ClippingBasicFragment.java

diff --git a/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/clippingbasic/MainActivity.java b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/clippingbasic/MainActivity.java
new file mode 100644
index 0000000..00ad983
--- /dev/null
+++ b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/clippingbasic/MainActivity.java

@@ -0,0 +1,110 @@
+/*
+* 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.clippingbasic;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        ClippingBasicFragment fragment = new ClippingBasicFragment();
+        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/ClippingBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable/gradient_drawable.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable/gradient_drawable.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/drawable/gradient_drawable.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/drawable/gradient_drawable.xml

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/layout/clipping_basic_fragment.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/layout/clipping_basic_fragment.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/layout/clipping_basic_fragment.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/layout/clipping_basic_fragment.xml

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/menu/main.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values/base-strings.xml
new file mode 100644
index 0000000..4df3b5c
--- /dev/null
+++ b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values/base-strings.xml

@@ -0,0 +1,31 @@
+<?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">ClippingBasic</string>
+    <string name="intro_message">
+        <![CDATA[
+        
+            
+            Basic sample to demonstrate clipping on a View.
+            
+        
+        ]]>
+    </string>
+</resources>

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/values/strings.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/ClippingBasic/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/ClippingBasic/ClippingBasicSample/tests/AndroidManifest.xml b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..ea04c40
--- /dev/null
+++ b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.
+-->
+<!-- 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.clippingbasic.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.clippingbasic"
+            android:label="Tests for com.example.android.clippingbasic" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ClippingBasic/Application/tests/src/com/example/android/clippingbasic/tests/SampleTests.java b/prebuilts/gradle/ClippingBasic/ClippingBasicSample/tests/src/com/example/android/clippingbasic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ClippingBasic/Application/tests/src/com/example/android/clippingbasic/tests/SampleTests.java
rename to prebuilts/gradle/ClippingBasic/ClippingBasicSample/tests/src/com/example/android/clippingbasic/tests/SampleTests.java

diff --git a/prebuilts/gradle/ClippingBasic/LICENSE b/prebuilts/gradle/ClippingBasic/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/ClippingBasic/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/ClippingBasic/README.md b/prebuilts/gradle/ClippingBasic/README.md
deleted file mode 100644
index f6347ea..0000000
--- a/prebuilts/gradle/ClippingBasic/README.md
+++ /dev/null

@@ -1,49 +0,0 @@
-Android ClippingBasic Sample
-==============================
-
-Basic sample to demonstrate clipping on a View.
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-ClippingBasic
-
-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/ClippingBasic/README.txt b/prebuilts/gradle/ClippingBasic/README.txt
new file mode 100644
index 0000000..9616c58
--- /dev/null
+++ b/prebuilts/gradle/ClippingBasic/README.txt

@@ -0,0 +1,18 @@
+Build Instructions
+-------------------
+
+This sample uses the Gradle build system. To build this project, use the
+"gradlew build" command or use "Import Project" in Android Studio.
+
+To see a list of all available commands, run "gradlew tasks".
+
+Dependencies
+-------------
+
+- Android SDK Build-tools v18.1
+- Android Support Repository v2
+
+Dependencies are available for download via the Android SDK Manager.
+
+Android Studio is available for download at:
+    http://developer.android.com/sdk/installing/studio.html

diff --git a/prebuilts/gradle/ClippingBasic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ClippingBasic/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/ClippingBasic/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ClippingBasic/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/ClippingBasic/packaging.yaml b/prebuilts/gradle/ClippingBasic/packaging.yaml
deleted file mode 100644
index 2e26f7d..0000000
--- a/prebuilts/gradle/ClippingBasic/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-ClippingBasic
-level:        BEGINNER
-icon:         ClippingBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2

diff --git a/prebuilts/gradle/ClippingBasic/settings.gradle b/prebuilts/gradle/ClippingBasic/settings.gradle
index 9464a35..670e715 100644
--- a/prebuilts/gradle/ClippingBasic/settings.gradle
+++ b/prebuilts/gradle/ClippingBasic/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'ClippingBasicSample'

diff --git a/prebuilts/gradle/CustomChoiceList/Application/build.gradle b/prebuilts/gradle/CustomChoiceList/Application/build.gradle
deleted file mode 100644
index 85e2282..0000000
--- a/prebuilts/gradle/CustomChoiceList/Application/build.gradle
+++ /dev/null

@@ -1,68 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-repositories {
-    jcenter()
-}
-
-
-dependencies {
-
-    compile "com.android.support:support-v4:21.+"
-
-}
-
-// 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.0.0"
-
-    defaultConfig {
-        minSdkVersion 4
-        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/CustomChoiceList/CustomChoiceListSample/build.gradle b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/CustomChoiceList/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/CheckableLinearLayout.java

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/Cheeses.java b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/Cheeses.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/Cheeses.java
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/Cheeses.java

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/MainActivity.java b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/MainActivity.java
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/java/com/example/android/customchoicelist/MainActivity.java

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/color/hideable_text_color.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/color/hideable_text_color.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/color/hideable_text_color.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/color/hideable_text_color.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_checked.png
Binary files differ

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_hideable_item_unchecked.png
Binary files differ

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable/ic_hideable_item.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable/ic_hideable_item.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/drawable/ic_hideable_item.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/drawable/ic_hideable_item.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/list_item.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/list_item.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/list_item.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/list_item.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/styles.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomChoiceList/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/CustomChoiceList/CustomChoiceListSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/CustomChoiceList/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/CustomChoiceList/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/CustomChoiceList/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/CustomChoiceList/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/CustomChoiceList/settings.gradle b/prebuilts/gradle/CustomChoiceList/settings.gradle
index 9464a35..6d876cf 100644
--- a/prebuilts/gradle/CustomChoiceList/settings.gradle
+++ b/prebuilts/gradle/CustomChoiceList/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'CustomChoiceListSample'

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/CustomNotifications/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 3054ad7..0000000
--- a/prebuilts/gradle/CustomNotifications/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,43 +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.
--->
-
-
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.customnotifications"
-    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.customnotifications.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/CustomNotifications/CustomNotificationsSample/build.gradle b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/CustomNotifications/CustomNotificationsSample/src/main/AndroidManifest.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..b20a411
--- /dev/null
+++ b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/AndroidManifest.xml

@@ -0,0 +1,45 @@
+<?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.customnotifications"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-sdk
+        android:minSdkVersion="4"
+        android:targetSdkVersion="18" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.example.android.customnotifications.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/CustomNotifications/Application/src/main/java/com/example/android/customnotifications/MainActivity.java b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/java/com/example/android/customnotifications/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/java/com/example/android/customnotifications/MainActivity.java
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/java/com/example/android/customnotifications/MainActivity.java

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi-v11/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v11/ic_stat_custom.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi-v9/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi-v9/ic_stat_custom.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/ic_stat_custom.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-ldpi-v11/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v11/ic_stat_custom.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-ldpi-v9/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-ldpi-v9/ic_stat_custom.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi-v11/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v11/ic_stat_custom.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi-v9/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi-v9/ic_stat_custom.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-mdpi/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-mdpi/ic_stat_custom.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v11/ic_stat_custom.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi-v9/ic_stat_custom.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_custom.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_custom.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/ic_stat_custom.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/ic_stat_custom.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot_expanded.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot_expanded.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xhdpi/robot_expanded.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xhdpi/robot_expanded.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/notification.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/notification.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/notification_expanded.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification_expanded.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/notification_expanded.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/notification_expanded.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-sw720dp-land/dimens.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/values-v9/styles.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-v9/styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/values-v9/styles.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values-v9/styles.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/strings.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/styles.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/CustomNotifications/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomNotifications/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/CustomNotifications/CustomNotificationsSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/CustomNotifications/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/CustomNotifications/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/CustomNotifications/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/CustomNotifications/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/CustomNotifications/settings.gradle b/prebuilts/gradle/CustomNotifications/settings.gradle
index 9464a35..71d4992 100644
--- a/prebuilts/gradle/CustomNotifications/settings.gradle
+++ b/prebuilts/gradle/CustomNotifications/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'CustomNotificationsSample'

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/MainActivity.java b/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/MainActivity.java
deleted file mode 100644
index bbb6dc0..0000000
--- a/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/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.customtransition;
-
-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();
-            CustomTransitionFragment fragment = new CustomTransitionFragment();
-            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/CustomTransition/CustomTransitionSample/build.gradle b/prebuilts/gradle/CustomTransition/CustomTransitionSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/CustomTransition/CustomTransitionSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/CustomTransition/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/ChangeColor.java b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/ChangeColor.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/ChangeColor.java
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/ChangeColor.java

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/CustomTransitionFragment.java

diff --git a/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/MainActivity.java b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/MainActivity.java
new file mode 100644
index 0000000..a2b3562
--- /dev/null
+++ b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/java/com/example/android/customtransition/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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.customtransition;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        CustomTransitionFragment fragment = new CustomTransitionFragment();
+        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/CustomTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/layout/fragment_custom_transition.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/fragment_custom_transition.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/layout/fragment_custom_transition.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/fragment_custom_transition.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene1.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene1.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene1.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene1.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene2.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene2.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene2.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene2.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene3.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene3.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/layout/scene3.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/layout/scene3.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/menu/main.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/CustomTransition/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/CustomTransition/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/CustomTransition/CustomTransitionSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/CustomTransition/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/CustomTransition/gradle/wrapper/gradle-wrapper.properties
index 684b39c..88992c0 100644
--- a/prebuilts/gradle/CustomTransition/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/CustomTransition/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/CustomTransition/settings.gradle b/prebuilts/gradle/CustomTransition/settings.gradle
index 9464a35..3813ba8 100644
--- a/prebuilts/gradle/CustomTransition/settings.gradle
+++ b/prebuilts/gradle/CustomTransition/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'CustomTransitionSample'

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/tests/AndroidManifest.xml b/prebuilts/gradle/DisplayingBitmaps/Application/tests/AndroidManifest.xml
deleted file mode 100644
index a93e21f..0000000
--- a/prebuilts/gradle/DisplayingBitmaps/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.displayingbitmaps.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.displayingbitmaps"
-            android:label="Tests for com.example.android.displayingbitmaps" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/build.gradle b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/DisplayingBitmaps/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/provider/Images.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/provider/Images.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/provider/Images.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/provider/Images.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailActivity.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageDetailFragment.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridActivity.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/ImageGridFragment.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/ui/RecyclingImageView.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/AsyncTask.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/DiskLruCache.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageCache.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageFetcher.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageResizer.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/ImageWorker.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/RecyclingBitmapDrawable.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/Utils.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/Utils.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/java/com/example/android/displayingbitmaps/util/Utils.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/java/com/example/android/displayingbitmaps/util/Utils.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-nodpi/empty_photo.png b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-nodpi/empty_photo.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-nodpi/empty_photo.png
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-nodpi/empty_photo.png
Binary files differ

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable/photogrid_list_selector.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable/photogrid_list_selector.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/drawable/photogrid_list_selector.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/drawable/photogrid_list_selector.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_detail_fragment.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_fragment.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_detail_fragment.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_fragment.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_detail_pager.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_pager.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_detail_pager.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_detail_pager.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_grid_fragment.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_grid_fragment.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/layout/image_grid_fragment.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/layout/image_grid_fragment.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/menu/main_menu.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/menu/main_menu.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/menu/main_menu.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/menu/main_menu.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-large/dimens.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-large/dimens.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-large/dimens.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-large/dimens.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-v11/styles.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-v11/styles.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-xlarge/dimens.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-xlarge/dimens.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values-xlarge/dimens.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values-xlarge/dimens.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/colors.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/colors.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/colors.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/strings.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/styles.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/tests/AndroidManifest.xml b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..4ddcbbb
--- /dev/null
+++ b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/tests/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?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
+
+  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.displayingbitmaps.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.displayingbitmaps"
+            android:label="Tests for com.example.android.displayingbitmaps" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java b/prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/DisplayingBitmaps/Application/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java
rename to prebuilts/gradle/DisplayingBitmaps/DisplayingBitmapsSample/tests/src/com/example/android/displayingbitmaps/tests/SampleTests.java

diff --git a/prebuilts/gradle/DisplayingBitmaps/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/DisplayingBitmaps/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/DisplayingBitmaps/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/DisplayingBitmaps/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/DisplayingBitmaps/settings.gradle b/prebuilts/gradle/DisplayingBitmaps/settings.gradle
index 9464a35..a5c5699 100644
--- a/prebuilts/gradle/DisplayingBitmaps/settings.gradle
+++ b/prebuilts/gradle/DisplayingBitmaps/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'DisplayingBitmapsSample'

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/layout/sample_dashboard_item.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/layout/sample_dashboard_item.xml
deleted file mode 100644
index 516d289..0000000
--- a/prebuilts/gradle/DoneBar/Application/src/main/res/layout/sample_dashboard_item.xml
+++ /dev/null

@@ -1,50 +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.
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <!-- The CardView needs to be wrapped to ensure spacing is applied correctly. -->
-
-    <android.support.v7.widget.CardView
-        style="@style/Widget.SampleDashboard.Card"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            style="@style/Widget.SampleDashboard.Item"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@android:id/text1"
-                style="@style/Widget.SampleDashboard.Item.Title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Hello world" />
-
-            <TextView
-                android:id="@android:id/text2"
-                style="@style/Widget.SampleDashboard.Item.Description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        </LinearLayout>
-
-    </android.support.v7.widget.CardView>
-
-</FrameLayout>

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/values/activitycards-colors.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/values/activitycards-colors.xml
deleted file mode 100644
index 79605c7..0000000
--- a/prebuilts/gradle/DoneBar/Application/src/main/res/values/activitycards-colors.xml
+++ /dev/null

@@ -1,21 +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.
-  -->
-
-<resources>
-    <color name="teal">#009688</color>
-    <color name="black_87">#DD000000</color>
-    <color name="black_54">#89000000</color>
-</resources>

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/values/activitycards-dimens.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/values/activitycards-dimens.xml
deleted file mode 100644
index 714cb00..0000000
--- a/prebuilts/gradle/DoneBar/Application/src/main/res/values/activitycards-dimens.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>
-
-    <dimen name="card_padding">16dp</dimen>
-    <dimen name="card_margin">8dp</dimen>
-    
-</resources>
\ No newline at end of file

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/DoneBar/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 374dc51..0000000
--- a/prebuilts/gradle/DoneBar/Application/src/main/res/values/template-styles.xml
+++ /dev/null

@@ -1,76 +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" />
-
-    <style name="Theme.Sample" parent="Theme.Base" />
-
-    <style name="AppTheme" parent="Theme.Sample" />
-    <!-- Widget styling -->
-
-    <style name="Widget" />
-
-    <style name="Widget.SampleContentContainer">
-        <item name="android:paddingTop">@dimen/vertical_page_margin</item>
-        <item name="android:paddingBottom">@dimen/vertical_page_margin</item>
-        <item name="android:paddingLeft">@dimen/horizontal_page_margin</item>
-        <item name="android:paddingRight">@dimen/horizontal_page_margin</item>
-    </style>
-
-<style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceMedium</item>
-        <item name="android:lineSpacingMultiplier">1.1</item>
-        <item name="android:textColor">@color/black_54</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Grid" parent="Widget">
-        <item name="android:stretchMode">columnWidth</item>
-        <item name="android:columnWidth">200dp</item>
-        <item name="android:numColumns">auto_fit</item>
-        <item name="android:drawSelectorOnTop">true</item>
-        <item name="android:horizontalSpacing">0dp</item>
-        <item name="android:verticalSpacing">0dp</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Card" parent="Widget">
-        <item name="android:gravity">center</item>
-        <item name="android:layout_margin">@dimen/card_margin</item>
-        <item name="cardCornerRadius">4dp</item>
-        <item name="cardElevation">5dp</item>
-        <item name="contentPadding">@dimen/card_padding</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Item" parent="Widget">
-    </style>
-
-    <style name="Widget.SampleDashboard.Item.Title" parent="Widget">
-        <item name="android:layout_marginBottom">@dimen/margin_tiny</item>
-        <item name="android:textAppearance">?android:textAppearanceLarge</item>
-        <item name="android:textColor">@color/teal</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textSize">24sp</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Item.Description" parent="Widget">
-        <item name="android:textAppearance">?android:textAppearanceSmall</item>
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:textColor">@color/black_87</item>
-    </style>
-</resources>

diff --git a/prebuilts/gradle/DoneBar/Application/tests/AndroidManifest.xml b/prebuilts/gradle/DoneBar/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 6e910c7..0000000
--- a/prebuilts/gradle/DoneBar/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.donebar.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.donebar"
-            android:label="Tests for com.example.android.donebar" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/build.gradle b/prebuilts/gradle/DoneBar/DoneBarSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/DoneBar/DoneBarSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/DoneBar/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/DoneBarActivity.java b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneBarActivity.java
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/DoneBarActivity.java
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneBarActivity.java

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/DoneButtonActivity.java b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneButtonActivity.java
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/DoneButtonActivity.java
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/DoneButtonActivity.java

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/MainActivity.java b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/java/com/example/android/donebar/MainActivity.java
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/java/com/example/android/donebar/MainActivity.java

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_cancel.png b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_cancel.png
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_cancel.png
Binary files differ

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_done.png b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_done.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_action_done.png
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_action_done.png
Binary files differ

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_cancel.png b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_cancel.png
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_cancel.png
Binary files differ

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_done.png b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_done.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_action_done.png
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_action_done.png
Binary files differ

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_cancel.png b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_cancel.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_cancel.png
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_cancel.png
Binary files differ

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_done.png b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_done.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_action_done.png
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_action_done.png
Binary files differ

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done_cancel.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/layout/actionbar_custom_view_done_cancel.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/actionbar_custom_view_done_cancel.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_done_bar.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_done_bar.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_done_bar.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_done_bar.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_done_button.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_done_button.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_done_button.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_done_button.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_sample_dashboard.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_sample_dashboard.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/layout/activity_sample_dashboard.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/activity_sample_dashboard.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/layout/include_cancel_button.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/include_cancel_button.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/layout/include_cancel_button.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/include_cancel_button.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/layout/include_done_button.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/include_done_button.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/layout/include_done_button.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/include_done_button.xml

diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/sample_dashboard_item.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/sample_dashboard_item.xml
new file mode 100644
index 0000000..38987ee
--- /dev/null
+++ b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/layout/sample_dashboard_item.xml

@@ -0,0 +1,32 @@
+<!--
+  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"
+    style="@style/Widget.SampleDashboard.Item"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView android:id="@android:id/text1"
+        style="@style/Widget.SampleDashboard.Item.Title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView android:id="@android:id/text2"
+        style="@style/Widget.SampleDashboard.Item.Description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/menu/cancel.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/menu/cancel.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/menu/cancel.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/menu/cancel.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/values/activitycards-strings.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/activitycards-strings.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/values/activitycards-strings.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/activitycards-strings.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/values/strings.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/DoneBar/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/template-styles.xml
new file mode 100644
index 0000000..cafe531
--- /dev/null
+++ b/prebuilts/gradle/DoneBar/DoneBarSample/src/main/res/values/template-styles.xml

@@ -0,0 +1,71 @@
+<!--
+  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" />
+
+    <style name="Theme.Sample" parent="Theme.Base" />
+
+    <style name="AppTheme" parent="Theme.Sample" />
+    <!-- Widget styling -->
+
+    <style name="Widget" />
+
+    <style name="Widget.SampleContentContainer">
+        <item name="android:paddingTop">@dimen/vertical_page_margin</item>
+        <item name="android:paddingBottom">@dimen/vertical_page_margin</item>
+        <item name="android:paddingLeft">@dimen/horizontal_page_margin</item>
+        <item name="android:paddingRight">@dimen/horizontal_page_margin</item>
+    </style>
+
+    <style name="Widget.SampleMessage">
+        <item name="android:textAppearance">?android:textAppearanceMedium</item>
+        <item name="android:lineSpacingMultiplier">1.1</item>
+    </style>
+
+    <style name="Widget.SampleDashboard.Grid" parent="Widget">
+        <item name="android:stretchMode">columnWidth</item>
+        <item name="android:columnWidth">200dp</item>
+        <item name="android:numColumns">auto_fit</item>
+        <item name="android:drawSelectorOnTop">true</item>
+        <item name="android:horizontalSpacing">@dimen/margin_medium</item>
+        <item name="android:verticalSpacing">@dimen/margin_medium</item>
+    </style>
+
+    <style name="Widget.SampleDashboard.Item" parent="Widget">
+        <item name="android:background">@drawable/sample_dashboard_item_background</item>
+        <item name="android:paddingTop">@dimen/margin_small</item>
+        <item name="android:paddingLeft">@dimen/margin_medium</item>
+        <item name="android:paddingRight">@dimen/margin_medium</item>
+        <item name="android:paddingBottom">@dimen/margin_medium</item>
+    </style>
+
+    <style name="Widget.SampleDashboard.Item.Title" parent="Widget">
+        <item name="android:layout_marginBottom">@dimen/margin_tiny</item>
+        <item name="android:textAppearance">?android:textAppearanceLarge</item>
+        <item name="android:textColor">#09c</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">24sp</item>
+    </style>
+
+    <style name="Widget.SampleDashboard.Item.Description" parent="Widget">
+        <item name="android:textAppearance">?android:textAppearanceSmall</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+    </style>
+</resources>

diff --git a/prebuilts/gradle/DoneBar/DoneBarSample/tests/AndroidManifest.xml b/prebuilts/gradle/DoneBar/DoneBarSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..40eb5e1
--- /dev/null
+++ b/prebuilts/gradle/DoneBar/DoneBarSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.donebar.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.donebar"
+            android:label="Tests for com.example.android.donebar" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java b/prebuilts/gradle/DoneBar/DoneBarSample/tests/src/com/example/android/donebar/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/DoneBar/Application/tests/src/com/example/android/donebar/tests/SampleTests.java
rename to prebuilts/gradle/DoneBar/DoneBarSample/tests/src/com/example/android/donebar/tests/SampleTests.java

diff --git a/prebuilts/gradle/DoneBar/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/DoneBar/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/DoneBar/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/DoneBar/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/DoneBar/settings.gradle b/prebuilts/gradle/DoneBar/settings.gradle
index 9464a35..d060dc7 100644
--- a/prebuilts/gradle/DoneBar/settings.gradle
+++ b/prebuilts/gradle/DoneBar/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'DoneBarSample'

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
deleted file mode 100644
index 3228927..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/common/logger/Log.java
deleted file mode 100644
index 17503c5..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/common/logger/LogFragment.java
deleted file mode 100644
index b302acd..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/common/logger/LogNode.java
deleted file mode 100644
index bc37cab..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/common/logger/LogView.java
deleted file mode 100644
index c01542b..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
deleted file mode 100644
index 16a9e7b..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
deleted file mode 100644
index 19967dc..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/java/com/example/android/drawabletinting/DrawableTintingFragment.java b/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/drawabletinting/DrawableTintingFragment.java
deleted file mode 100644
index cd46fb9..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/drawabletinting/DrawableTintingFragment.java
+++ /dev/null

@@ -1,316 +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.drawabletinting;
-
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.SeekBar;
-import android.widget.Spinner;
-import android.widget.SpinnerAdapter;
-import android.widget.TextView;
-
-import com.example.android.common.logger.Log;
-
-/**
- * Sample that shows tinting of Drawables programmatically and of Drawable resources in XML.
- * Tinting is set on a nine-patch drawable through the "tint" and "tintMode" parameters.
- * A color state list is referenced as the tint color, which  defines colors for different
- * states of a View (for example disabled/enabled, focused, pressed or selected).
- * Programmatically, tinting is applied to a Drawable through its "setColorFilter" method, with
- * a reference to a color and a PorterDuff blend mode. The color and blend mode can be
- * changed from the UI.
- *
- * @see android.graphics.drawable.Drawable#setColorFilter(int, android.graphics.PorterDuff.Mode)
- * @see android.graphics.drawable.Drawable#setTint(android.content.res.ColorStateList, android.graphics.PorterDuff.Mode)
- */
-public class DrawableTintingFragment extends Fragment {
-
-    /**
-     * String that identifies logging output from this Fragment.
-     */
-    private static final String TAG = "DrawableTintingFragment";
-
-    /**
-     * Image that tinting is applied to programmatically.
-     */
-    private ImageView mImage;
-
-    /**
-     * Seekbar for alpha component of tinting color.
-     */
-    private SeekBar mAlphaBar;
-    /**
-     * Seekbar for red component of tinting color.
-     */
-    private SeekBar mRedBar;
-    /**
-     * Seekbar for green bar of tinting color.
-     */
-    private SeekBar mGreenBar;
-    /**
-     * Seekbar for blue bar of tinting color.
-     */
-    private SeekBar mBlueBar;
-
-    /**
-     * Text label for alpha component seekbar.
-     */
-    private TextView mAlphaText;
-    /**
-     * Text label for red component seekbar.
-     */
-    private TextView mRedText;
-    /**
-     * Text label for green component seekbar.
-     */
-    private TextView mGreenText;
-    /**
-     * Text label for blue component seekbar.
-     */
-    private TextView mBlueText;
-
-    /**
-     * Selector for blend type for color tinting.
-     */
-    private Spinner mBlendSpinner;
-
-    /**
-     * Computed color for tinting of drawable.
-     */
-    private int mHintColor;
-
-    /**
-     * Selected color tinting mode.
-     */
-    private PorterDuff.Mode mMode;
-
-    /**
-     * Identifier for state of blend mod spinner in state bundle.
-     */
-    private static final String STATE_BLEND = "DRAWABLETINTING_BLEND";
-    /**
-     * Identifier for state of alpha seek bar in state bundle.
-     */
-    private static final String STATE_ALPHA = "DRAWABLETINTING_ALPHA";
-    /**
-     * Identifier for state of red seek bar in state bundle.
-     */
-    private static final String STATE_RED = "DRAWABLETINTING_RED";
-    /**
-     * Identifier for state of green seek bar in state bundle.
-     */
-    private static final String STATE_GREEN = "DRAWABLETINTING_GREEN";
-    /**
-     * Identifier for state of blue seek bar in state bundle.
-     */
-    private static final String STATE_BLUE = "DRAWABLETINTING_BLUE";
-
-    /**
-     * Available tinting modes. Note that this array must be kept in sync with the
-     * <code>blend_modes</code> string array that provides labels for these modes.
-     */
-    private static final PorterDuff.Mode[] MODES = new PorterDuff.Mode[]{
-            PorterDuff.Mode.ADD,
-            PorterDuff.Mode.CLEAR,
-            PorterDuff.Mode.DARKEN,
-            PorterDuff.Mode.DST,
-            PorterDuff.Mode.DST_ATOP,
-            PorterDuff.Mode.DST_IN,
-            PorterDuff.Mode.DST_OUT,
-            PorterDuff.Mode.DST_OVER,
-            PorterDuff.Mode.LIGHTEN,
-            PorterDuff.Mode.MULTIPLY,
-            PorterDuff.Mode.OVERLAY,
-            PorterDuff.Mode.SCREEN,
-            PorterDuff.Mode.SRC,
-            PorterDuff.Mode.SRC_ATOP,
-            PorterDuff.Mode.SRC_IN,
-            PorterDuff.Mode.SRC_OUT,
-            PorterDuff.Mode.SRC_OVER,
-            PorterDuff.Mode.XOR
-    };
-
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.tinting_fragment, null);
-
-        // Set a drawable as the image to display
-        mImage = (ImageView) v.findViewById(R.id.image);
-        mImage.setImageResource(R.drawable.btn_default_normal_holo);
-
-        // Get text labels and seekbars for the four color components: ARGB
-        mAlphaBar = (SeekBar) v.findViewById(R.id.alphaSeek);
-        mAlphaText = (TextView) v.findViewById(R.id.alphaText);
-        mGreenBar = (SeekBar) v.findViewById(R.id.greenSeek);
-        mGreenText = (TextView) v.findViewById(R.id.greenText);
-        mRedBar = (SeekBar) v.findViewById(R.id.redSeek);
-        mRedText = (TextView) v.findViewById(R.id.redText);
-        mBlueText = (TextView) v.findViewById(R.id.blueText);
-        mBlueBar = (SeekBar) v.findViewById(R.id.blueSeek);
-
-        // Set a listener to update tinted image when selections have changed
-        mAlphaBar.setOnSeekBarChangeListener(mSeekBarListener);
-        mRedBar.setOnSeekBarChangeListener(mSeekBarListener);
-        mGreenBar.setOnSeekBarChangeListener(mSeekBarListener);
-        mBlueBar.setOnSeekBarChangeListener(mSeekBarListener);
-
-
-        // Set up the spinner for blend mode selection from a string array resource
-        mBlendSpinner = (Spinner) v.findViewById(R.id.blendSpinner);
-        SpinnerAdapter sa = ArrayAdapter.createFromResource(getActivity(),
-                R.array.blend_modes, android.R.layout.simple_spinner_dropdown_item);
-        mBlendSpinner.setAdapter(sa);
-        // Set a listener to update the tinted image when a blend mode is selected
-        mBlendSpinner.setOnItemSelectedListener(mBlendListener);
-        // Select the first item
-        mBlendSpinner.setSelection(0);
-        mMode = MODES[0];
-
-        if (savedInstanceState != null) {
-            // Restore the previous state if this fragment has been restored
-            mBlendSpinner.setSelection(savedInstanceState.getInt(STATE_BLEND));
-            mAlphaBar.setProgress(savedInstanceState.getInt(STATE_ALPHA));
-            mRedBar.setProgress(savedInstanceState.getInt(STATE_RED));
-            mGreenBar.setProgress(savedInstanceState.getInt(STATE_GREEN));
-            mBlueBar.setProgress(savedInstanceState.getInt(STATE_BLUE));
-        }
-
-        // Apply the default blend mode and color
-        updateTint(getColor(), getTintMode());
-
-        return v;
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        Log.d(TAG, "state saved.");
-        outState.putInt(STATE_BLEND, mBlendSpinner.getSelectedItemPosition());
-        outState.putInt(STATE_ALPHA, mAlphaBar.getProgress());
-        outState.putInt(STATE_RED, mRedBar.getProgress());
-        outState.putInt(STATE_GREEN, mGreenBar.getProgress());
-        outState.putInt(STATE_BLUE, mBlueBar.getProgress());
-    }
-
-    /**
-     * Computes the {@link Color} value from selection on ARGB sliders.
-     *
-     * @return color computed from selected ARGB values
-     */
-    public int getColor() {
-        final int alpha = mAlphaBar.getProgress();
-        final int red = mRedBar.getProgress();
-        final int green = mGreenBar.getProgress();
-        final int blue = mBlueBar.getProgress();
-
-        return Color.argb(alpha, red, green, blue);
-    }
-
-    /**
-     * Returns the {@link android.graphics.PorterDuff.Mode} for the selected tint mode option.
-     *
-     * @return selected tint mode
-     */
-    public PorterDuff.Mode getTintMode() {
-        return MODES[mBlendSpinner.getSelectedItemPosition()];
-    }
-
-    /**
-     * Update the tint of the image with the color set in the seekbars and selected blend mode.
-     * The seekbars are set to a maximum of 255, with one for each of the four components of the
-     * ARGB color. (Alpha, Red, Green, Blue.) Once a color has been computed using
-     * {@link Color#argb(int, int, int, int)}, it is set togethe with the blend mode on the background
-     * image using
-     * {@link android.widget.ImageView#setColorFilter(int, android.graphics.PorterDuff.Mode)}.
-     */
-    public void updateTint(int color, PorterDuff.Mode mode) {
-        // Set the color hint of the image: ARGB
-        mHintColor = color;
-
-        // Set the color tint mode based on the selection of the Spinner
-        mMode = mode;
-
-        // Log selection
-        Log.d(TAG, String.format("Updating tint with color [ARGB: %d,%d,%d,%d] and mode [%s]",
-                Color.alpha(color), Color.red(color), Color.green(color), Color.blue(color),
-                mode.toString()));
-
-        // Apply the color tint for the selected tint mode
-        mImage.setColorFilter(mHintColor, mMode);
-
-        // Update the text for each label with the value of each channel
-        mAlphaText.setText(getString(R.string.value_alpha, Color.alpha(color)));
-        mRedText.setText(getString(R.string.value_red, Color.red(color)));
-        mGreenText.setText(getString(R.string.value_green, Color.green(color)));
-        mBlueText.setText(getString(R.string.value_blue, Color.blue(color)));
-    }
-
-    /**
-     * Listener that updates the tint when a blend mode is selected.
-     */
-    private AdapterView.OnItemSelectedListener mBlendListener =
-            new AdapterView.OnItemSelectedListener() {
-
-                @Override
-                public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                    // Selected a blend mode and update the tint of image
-                    updateTint(getColor(), getTintMode());
-                }
-
-                @Override
-                public void onNothingSelected(AdapterView<?> adapterView) {
-
-                }
-
-            };
-
-    /**
-     * Seekbar listener that updates the tinted color when the progress bar has changed.
-     */
-    private SeekBar.OnSeekBarChangeListener mSeekBarListener =
-            new SeekBar.OnSeekBarChangeListener() {
-                @Override
-                public void onProgressChanged(SeekBar seekBar, int i, boolean b) {
-                    // Update the tinted color from all selections in the UI
-                    updateTint(getColor(), getTintMode());
-                }
-
-                @Override
-                public void onStartTrackingTouch(SeekBar seekBar) {
-                }
-
-                @Override
-                public void onStopTrackingTouch(SeekBar seekBar) {
-                }
-            };
-}

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/drawabletinting/MainActivity.java b/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/drawabletinting/MainActivity.java
deleted file mode 100644
index d00bc37..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/java/com/example/android/drawabletinting/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.drawabletinting;
-
-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();
-            DrawableTintingFragment fragment = new DrawableTintingFragment();
-            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/DrawableTinting/Application/src/main/res/color/custom_tint.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/color/custom_tint.xml
deleted file mode 100644
index 983880a..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/color/custom_tint.xml
+++ /dev/null

@@ -1,37 +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.
--->
-
-<!-- This color state list defines the color applied to the "buttonbackground" drawable.
-  A color is selected based on the state of its view.-->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Pressed state -->
-    <item android:color="@color/red" android:state_pressed="true" />
-
-    <!-- Focused state -->
-    <item android:color="@color/light_purple" android:state_focused="true" />
-
-    <item android:color="@color/deep_purple" android:state_enabled="true" />
-
-    <!-- Disabled state -->
-    <item android:color="@color/light_blue" android:state_enabled="false" />
-
-    <!-- Default -->
-    <item android:color="@color/light_blue" />
-
-
-</selector>
\ No newline at end of file

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-hdpi/btn_default_normal_holo.9.png b/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-hdpi/btn_default_normal_holo.9.png
deleted file mode 100644
index dbcede7..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-hdpi/btn_default_normal_holo.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index a8cb237..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-mdpi/btn_default_normal_holo.9.png b/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-mdpi/btn_default_normal_holo.9.png
deleted file mode 100644
index 0e0da34..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-mdpi/btn_default_normal_holo.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 9249aa2..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xhdpi/btn_default_normal_holo.9.png b/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xhdpi/btn_default_normal_holo.9.png
deleted file mode 100644
index 92a49db..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xhdpi/btn_default_normal_holo.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 5d57004..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xxhdpi/btn_default_normal_holo.9.png b/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xxhdpi/btn_default_normal_holo.9.png
deleted file mode 100644
index c1632c8..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xxhdpi/btn_default_normal_holo.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 9ceea0e..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable/buttonbackground.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable/buttonbackground.xml
deleted file mode 100644
index 060c5c7..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/drawable/buttonbackground.xml
+++ /dev/null

@@ -1,24 +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.
--->
-
-<!-- This nine patch definition refers to a drawable bitmap (btn_default_holo.png) to which
-a tint is applied. The tint is a color state list that changes color based on the state of the
-view it is applied to. Refer to its definition in "color/custom_tint.xml". -->
-<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/btn_default_normal_holo"
-    android:tint="@color/custom_tint"
-    android:tintMode="multiply" />
\ No newline at end of file

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/layout-w720dp/activity_main.xml
deleted file mode 100755
index c9a52f6..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index 1ae4f98..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/res/layout/tinting_fragment.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/layout/tinting_fragment.xml
deleted file mode 100644
index 0a3bfa7..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/layout/tinting_fragment.xml
+++ /dev/null

@@ -1,124 +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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/vertical_page_margin"
-        android:layout_marginEnd="@dimen/horizontal_page_margin"
-        android:layout_marginStart="@dimen/horizontal_page_margin"
-        android:layout_marginTop="@dimen/vertical_page_margin"
-        android:orientation="vertical"
-        android:paddingBottom="@dimen/horizontal_page_margin">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/resource_tint_label" />
-
-        <!-- Button on which the background is set to a Drawable resource that references a
-          color state list to define its tint. The color varies based on the state of the View. -->
-        <Button
-            android:id="@+id/button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:background="@drawable/buttonbackground"
-            android:paddingEnd="7dp"
-            android:paddingStart="7dp"
-            android:text="@string/resource_tint_button" />
-
-        <!-- Image -->
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/prog_tint_label" />
-
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="200dp"
-            android:layout_height="50dp"
-            android:layout_gravity="center_horizontal"
-            android:scaleType="fitXY"
-            android:tint="#330000FF" />
-
-        <!-- Blend mode -->
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="0dp"
-            android:text="@string/blend_mode_label" />
-
-        <Spinner
-            android:id="@+id/blendSpinner"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <!-- Alpha -->
-        <TextView
-            android:id="@+id/alphaText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <SeekBar
-            android:id="@+id/alphaSeek"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:max="255"
-            android:progress="255" />
-
-        <!-- Red -->
-        <TextView
-            android:id="@+id/redText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <SeekBar
-            android:id="@+id/redSeek"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:max="255" />
-
-        <!-- Green -->
-        <TextView
-            android:id="@+id/greenText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <SeekBar
-            android:id="@+id/greenSeek"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:max="255" />
-
-        <!-- Blue -->
-        <TextView
-            android:id="@+id/blueText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <SeekBar
-            android:id="@+id/blueSeek"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:max="255" />
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/menu/main.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/menu/main.xml
deleted file mode 100644
index b49c2c5..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/values-v11/template-styles.xml
deleted file mode 100644
index 8c1ea66..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 1b3516a..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,35 +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">DrawableTinting</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            Sample that shows applying tinting and color filters to Drawables both programmatically
-            and as Drawable resources in XML.
-            \n\nTinting is set on a nine-patch drawable through the "tint" and "tintMode" parameters.
-            A color state list is referenced as the tint color, which defines colors for different
-            states of a View (for example disabled/enabled, focused, pressed or selected).
-            \n\nProgrammatically, tinting is applied to a Drawable through its "setColorFilter" method,
-            with a reference to a color and a PorterDuff blend mode. The color and blend mode can be
-            changed from the UI to see the effect of different options.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/color.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/color.xml
deleted file mode 100644
index 86a2db7..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/color.xml
+++ /dev/null

@@ -1,26 +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>
-
-    <color name="red">#e51c23</color>
-    <color name="light_purple">#e1bee7</color>
-    <color name="deep_purple">#673ab7</color>
-    <color name="light_blue">#e7e9fd</color>
-    <color name="green">#259b24</color>
-
-</resources>
\ No newline at end of file

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/fragmentview_strings.xml
deleted file mode 100755
index 7b9d9ec..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/res/values/strings.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/strings.xml
deleted file mode 100644
index 4a517d1..0000000
--- a/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/strings.xml
+++ /dev/null

@@ -1,49 +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="resource_tint_label">Button with tinting set by state color list as resource:</string>
-    <string name="resource_tint_button">Tinting set by StateDrawable</string>
-    <string name="prog_tint_label">View with tinting set programmatically:</string>
-    <string name="value_alpha">Alpha: %d\%</string>
-    <string name="value_red">Red: %d\%</string>
-    <string name="value_green">Green: %d\%</string>
-    <string name="value_blue">Blue: %d\%</string>
-    <string name="blend_mode_label">Blend Mode:</string>
-
-    <string-array name="blend_modes">
-        <item>Add</item>
-        <item>Clear</item>
-        <item>Darken</item>
-        <item>Destination (DST)</item>
-        <item>Destination atop (DST_ATOP)</item>
-        <item>Destination in (DST_IN)</item>
-        <item>Destination out (DST_OUT)</item>
-        <item>Destination over (DST_OVER)</item>
-        <item>Lighten</item>
-        <item>Multiply</item>
-        <item>Overlay</item>
-        <item>Screen</item>
-        <item>Source (SRC)</item>
-        <item>Source atop (SRC_ATOP)</item>
-        <item>Source in (SRC_IN)</item>
-        <item>Source out (SRC_OUT)</item>
-        <item>Source over (SRC_OVER)</item>
-        <item>XOR</item>
-    </string-array>
-
-</resources>
\ No newline at end of file

diff --git a/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/DrawableTinting/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 6e7d593..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/CONTRIB.md b/prebuilts/gradle/DrawableTinting/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/LICENSE b/prebuilts/gradle/DrawableTinting/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/README.md b/prebuilts/gradle/DrawableTinting/README.md
deleted file mode 100644
index db2efaa..0000000
--- a/prebuilts/gradle/DrawableTinting/README.md
+++ /dev/null

@@ -1,61 +0,0 @@
-Android DrawableTinting Sample
-==============================
-
-Sample that shows applying tinting and color filters to Drawables both programmatically
-and as Drawable resources in XML.
-
-Introduction
-------------
-
-Tinting is set on a nine-patch drawable through the "tint" and "tintMode" parameters.
-A color state list is referenced as the tint color, which defines colors for different
-states of a View (for example disabled/enabled, focused, pressed or selected).
-
-Programmatically, tinting is applied to a Drawable through its "setColorFilter" method,
-with a reference to a color and a PorterDuff blend mode. The color and blend mode can be
-changed from the UI to see the effect of different options.
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-DrawableTinting
-
-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/DrawableTinting/build.gradle b/prebuilts/gradle/DrawableTinting/build.gradle
deleted file mode 100644
index 584ba87..0000000
--- a/prebuilts/gradle/DrawableTinting/build.gradle
+++ /dev/null

@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-

diff --git a/prebuilts/gradle/DrawableTinting/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/DrawableTinting/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/gradle/DrawableTinting/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/DrawableTinting/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/DrawableTinting/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 56f685a..0000000
--- a/prebuilts/gradle/DrawableTinting/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-#Wed Apr 10 15:27:10 PDT 2013
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/DrawableTinting/gradlew b/prebuilts/gradle/DrawableTinting/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/DrawableTinting/gradlew
+++ /dev/null

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/prebuilts/gradle/DrawableTinting/gradlew.bat b/prebuilts/gradle/DrawableTinting/gradlew.bat
deleted file mode 100644
index 8a0b282..0000000
--- a/prebuilts/gradle/DrawableTinting/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/DrawableTinting/packaging.yaml b/prebuilts/gradle/DrawableTinting/packaging.yaml
deleted file mode 100644
index 67e603d..0000000
--- a/prebuilts/gradle/DrawableTinting/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-DrawableTinting
-level:        BEGINNER
-icon:         DrawableTintingSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2

diff --git a/prebuilts/gradle/DrawableTinting/settings.gradle b/prebuilts/gradle/DrawableTinting/settings.gradle
deleted file mode 100644
index 9464a35..0000000
--- a/prebuilts/gradle/DrawableTinting/settings.gradle
+++ /dev/null

@@ -1 +0,0 @@
-include 'Application'

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/elevationbasic/MainActivity.java b/prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/elevationbasic/MainActivity.java
deleted file mode 100644
index f4285d2..0000000
--- a/prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/elevationbasic/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.elevationbasic;
-
-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();
-            ElevationBasicFragment fragment = new ElevationBasicFragment();
-            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/ElevationBasic/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/ElevationBasic/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 9ae4843..0000000
--- a/prebuilts/gradle/ElevationBasic/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,30 +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">ElevationBasic</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            This sample demonstrates two alternative ways to move a view in the z-axis. The
-            first view has a fixed elevation using XML and the second one is raised when the user
-            taps on it, using setTranslationZ().
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/ElevationBasic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/ElevationBasic/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 800c0ba..0000000
--- a/prebuilts/gradle/ElevationBasic/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,41 +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.
--->
-
-<!-- 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.elevationbasic.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.elevationbasic"
-            android:label="Tests for com.example.android.elevationbasic" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ElevationBasic/CONTRIB.md b/prebuilts/gradle/ElevationBasic/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/ElevationBasic/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/ElevationBasic/ElevationBasicSample/build.gradle b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/build.gradle
new file mode 100644
index 0000000..a0487e5
--- /dev/null
+++ b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/build.gradle

@@ -0,0 +1,62 @@
+
+
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 "android-L"
+
+    buildToolsVersion "19.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/ElevationBasic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/elevationbasic/ElevationBasicFragment.java b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/elevationbasic/ElevationBasicFragment.java
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/java/com/example/android/elevationbasic/ElevationBasicFragment.java
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/elevationbasic/ElevationBasicFragment.java

diff --git a/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/elevationbasic/MainActivity.java b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/elevationbasic/MainActivity.java
new file mode 100644
index 0000000..89fd171
--- /dev/null
+++ b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/java/com/example/android/elevationbasic/MainActivity.java

@@ -0,0 +1,110 @@
+/*
+* 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.elevationbasic;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        ElevationBasicFragment fragment = new ElevationBasicFragment();
+        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/ElevationBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable/shape.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable/shape.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable/shape.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable/shape.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable/shape2.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable/shape2.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/drawable/shape2.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/drawable/shape2.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/layout/elevation_basic.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/layout/elevation_basic.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/layout/elevation_basic.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/layout/elevation_basic.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/menu/main.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values/base-strings.xml
new file mode 100644
index 0000000..3f1a444
--- /dev/null
+++ b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values/base-strings.xml

@@ -0,0 +1,33 @@
+<?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">ElevationBasic</string>
+    <string name="intro_message">
+        <![CDATA[
+        
+            
+            This sample demonstrates two alternative ways to move a view in the z-axis. The
+            first view has a fixed elevation using XML and the second one is raised when the user
+            taps on it, using setTranslationZ().
+            
+        
+        ]]>
+    </string>
+</resources>

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/values/colors.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/values/colors.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values/colors.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/ElevationBasic/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/ElevationBasic/ElevationBasicSample/tests/AndroidManifest.xml b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..84b80b1
--- /dev/null
+++ b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/tests/AndroidManifest.xml

@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<!-- 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.elevationbasic.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="19"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.elevationbasic"
+            android:label="Tests for com.example.android.elevationbasic" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ElevationBasic/Application/tests/src/com/example/android/elevationbasic/tests/SampleTests.java b/prebuilts/gradle/ElevationBasic/ElevationBasicSample/tests/src/com/example/android/elevationbasic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ElevationBasic/Application/tests/src/com/example/android/elevationbasic/tests/SampleTests.java
rename to prebuilts/gradle/ElevationBasic/ElevationBasicSample/tests/src/com/example/android/elevationbasic/tests/SampleTests.java

diff --git a/prebuilts/gradle/ElevationBasic/LICENSE b/prebuilts/gradle/ElevationBasic/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/ElevationBasic/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/ElevationBasic/README.md b/prebuilts/gradle/ElevationBasic/README.md
deleted file mode 100644
index b40a734..0000000
--- a/prebuilts/gradle/ElevationBasic/README.md
+++ /dev/null

@@ -1,51 +0,0 @@
-Android ElevationBasic Sample
-==============================
-
-This sample demonstrates two alternative ways to move a view in the z-axis. The
-first view has a fixed elevation using XML and the second one is raised when the user
-taps on it, using setTranslationZ().
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-ElevationBasic
-
-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/ElevationBasic/README.txt b/prebuilts/gradle/ElevationBasic/README.txt
new file mode 100644
index 0000000..9616c58
--- /dev/null
+++ b/prebuilts/gradle/ElevationBasic/README.txt

@@ -0,0 +1,18 @@
+Build Instructions
+-------------------
+
+This sample uses the Gradle build system. To build this project, use the
+"gradlew build" command or use "Import Project" in Android Studio.
+
+To see a list of all available commands, run "gradlew tasks".
+
+Dependencies
+-------------
+
+- Android SDK Build-tools v18.1
+- Android Support Repository v2
+
+Dependencies are available for download via the Android SDK Manager.
+
+Android Studio is available for download at:
+    http://developer.android.com/sdk/installing/studio.html

diff --git a/prebuilts/gradle/ElevationBasic/packaging.yaml b/prebuilts/gradle/ElevationBasic/packaging.yaml
deleted file mode 100644
index cb6d6c2..0000000
--- a/prebuilts/gradle/ElevationBasic/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:   [NoGroup]
-languages:    [Java]
-solutions:    [Mobile]
-github:       googlesamples/android-ElevationBasic
-level:        BEGINNER
-icon:         ElevationBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2

diff --git a/prebuilts/gradle/ElevationBasic/settings.gradle b/prebuilts/gradle/ElevationBasic/settings.gradle
index 9464a35..99cb553 100644
--- a/prebuilts/gradle/ElevationBasic/settings.gradle
+++ b/prebuilts/gradle/ElevationBasic/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'ElevationBasicSample'

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/elevationdrag/MainActivity.java b/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/elevationdrag/MainActivity.java
deleted file mode 100644
index 98579bf..0000000
--- a/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/elevationdrag/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.elevationdrag;
-
-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();
-            ElevationDragFragment fragment = new ElevationDragFragment();
-            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/ElevationDrag/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/ElevationDrag/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 133e1b3..0000000
--- a/prebuilts/gradle/ElevationDrag/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,30 +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">ElevationDrag</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            This sample demonstrates a drag and drop action on different shapes. Elevation and
-            z-translation are used to render the shadows and the views are clipped using different
-            Outlines.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/ElevationDrag/Application/tests/AndroidManifest.xml b/prebuilts/gradle/ElevationDrag/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 60c9a19..0000000
--- a/prebuilts/gradle/ElevationDrag/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.elevationdrag.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.elevationdrag"
-            android:label="Tests for com.example.android.elevationdrag" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ElevationDrag/CONTRIB.md b/prebuilts/gradle/ElevationDrag/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/ElevationDrag/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/ElevationDrag/ElevationDragSample/build.gradle b/prebuilts/gradle/ElevationDrag/ElevationDragSample/build.gradle
new file mode 100644
index 0000000..a0487e5
--- /dev/null
+++ b/prebuilts/gradle/ElevationDrag/ElevationDragSample/build.gradle

@@ -0,0 +1,62 @@
+
+
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 "android-L"
+
+    buildToolsVersion "19.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/ElevationDrag/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/elevationdrag/DragFrameLayout.java b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/elevationdrag/DragFrameLayout.java
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/elevationdrag/DragFrameLayout.java
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/elevationdrag/DragFrameLayout.java

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/elevationdrag/ElevationDragFragment.java b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/elevationdrag/ElevationDragFragment.java
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/java/com/example/android/elevationdrag/ElevationDragFragment.java
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/elevationdrag/ElevationDragFragment.java

diff --git a/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/elevationdrag/MainActivity.java b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/elevationdrag/MainActivity.java
new file mode 100644
index 0000000..a143af0
--- /dev/null
+++ b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/java/com/example/android/elevationdrag/MainActivity.java

@@ -0,0 +1,110 @@
+/*
+* 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.elevationdrag;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        ElevationDragFragment fragment = new ElevationDragFragment();
+        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/ElevationDrag/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/layout/ztranslation.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/layout/ztranslation.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/layout/ztranslation.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/layout/ztranslation.xml

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/menu/main.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/base-strings.xml
new file mode 100644
index 0000000..3fc6710
--- /dev/null
+++ b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/base-strings.xml

@@ -0,0 +1,33 @@
+<?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">ElevationDrag</string>
+    <string name="intro_message">
+        <![CDATA[
+        
+            
+            This sample demonstrates a drag and drop action on different shapes. Elevation and
+            z-translation are used to render the shadows and the views are clipped using different
+            Outlines.
+            
+        
+        ]]>
+    </string>
+</resources>

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/values/colors.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/values/colors.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/colors.xml

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/ElevationDrag/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/ElevationDrag/ElevationDragSample/tests/AndroidManifest.xml b/prebuilts/gradle/ElevationDrag/ElevationDragSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..e69afec
--- /dev/null
+++ b/prebuilts/gradle/ElevationDrag/ElevationDragSample/tests/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?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
+
+  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.elevationdrag.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.elevationdrag"
+            android:label="Tests for com.example.android.elevationdrag" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java b/prebuilts/gradle/ElevationDrag/ElevationDragSample/tests/src/com/example/android/elevationdrag/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ElevationDrag/Application/tests/src/com/example/android/elevationdrag/tests/SampleTests.java
rename to prebuilts/gradle/ElevationDrag/ElevationDragSample/tests/src/com/example/android/elevationdrag/tests/SampleTests.java

diff --git a/prebuilts/gradle/ElevationDrag/LICENSE b/prebuilts/gradle/ElevationDrag/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/ElevationDrag/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/ElevationDrag/README.md b/prebuilts/gradle/ElevationDrag/README.md
deleted file mode 100644
index f3c2129..0000000
--- a/prebuilts/gradle/ElevationDrag/README.md
+++ /dev/null

@@ -1,51 +0,0 @@
-Android ElevationDrag Sample
-==============================
-
-This sample demonstrates a drag and drop action on different shapes. Elevation and
-z-translation are used to render the shadows and the views are clipped using different
-Outlines.
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-ElevationDrag
-
-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/ElevationDrag/README.txt b/prebuilts/gradle/ElevationDrag/README.txt
new file mode 100644
index 0000000..9616c58
--- /dev/null
+++ b/prebuilts/gradle/ElevationDrag/README.txt

@@ -0,0 +1,18 @@
+Build Instructions
+-------------------
+
+This sample uses the Gradle build system. To build this project, use the
+"gradlew build" command or use "Import Project" in Android Studio.
+
+To see a list of all available commands, run "gradlew tasks".
+
+Dependencies
+-------------
+
+- Android SDK Build-tools v18.1
+- Android Support Repository v2
+
+Dependencies are available for download via the Android SDK Manager.
+
+Android Studio is available for download at:
+    http://developer.android.com/sdk/installing/studio.html

diff --git a/prebuilts/gradle/ElevationDrag/gradle/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ElevationDrag/gradle/gradle/wrapper/gradle-wrapper.properties
index eefbc0a..da0cd7c 100644
--- a/prebuilts/gradle/ElevationDrag/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ElevationDrag/gradle/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/ElevationDrag/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ElevationDrag/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/ElevationDrag/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ElevationDrag/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/ElevationDrag/packaging.yaml b/prebuilts/gradle/ElevationDrag/packaging.yaml
deleted file mode 100644
index 044a7d3..0000000
--- a/prebuilts/gradle/ElevationDrag/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-ElevationDrag
-level:        BEGINNER
-icon:         ElevationDragSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2

diff --git a/prebuilts/gradle/ElevationDrag/settings.gradle b/prebuilts/gradle/ElevationDrag/settings.gradle
index 9464a35..bb7fd61 100644
--- a/prebuilts/gradle/ElevationDrag/settings.gradle
+++ b/prebuilts/gradle/ElevationDrag/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'ElevationDragSample'

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 8f26c99..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,38 +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.floatingactionbuttonbasic"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
-        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>
-    </application>
-
-
-</manifest>

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
deleted file mode 100644
index 3228927..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/Log.java
deleted file mode 100644
index 17503c5..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
deleted file mode 100644
index b302acd..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java
deleted file mode 100644
index bc37cab..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/LogView.java
deleted file mode 100644
index c01542b..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
deleted file mode 100644
index 16a9e7b..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
deleted file mode 100644
index 19967dc..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/java/com/example/android/floatingactionbuttonbasic/FloatingActionButtonBasicFragment.java b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/floatingactionbuttonbasic/FloatingActionButtonBasicFragment.java
deleted file mode 100644
index 817cfb7..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/floatingactionbuttonbasic/FloatingActionButtonBasicFragment.java
+++ /dev/null

@@ -1,67 +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.floatingactionbuttonbasic;
-
-import com.example.android.common.logger.Log;
-
-import android.app.Activity;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-
-/**
- * This fragment inflates a layout with two Floating Action Buttons and acts as a listener to
- * changes on them.
- */
-public class FloatingActionButtonBasicFragment extends Fragment implements FloatingActionButton.OnCheckedChangeListener{
-
-    private final static String TAG = "FloatingActionButtonBasicFragment";
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        View rootView = inflater.inflate(R.layout.fab_layout, container, false);
-
-        // Make this {@link Fragment} listen for changes in both FABs.
-        FloatingActionButton fab1 = (FloatingActionButton) rootView.findViewById(R.id.fab_1);
-        fab1.setOnCheckedChangeListener(this);
-        FloatingActionButton fab2 = (FloatingActionButton) rootView.findViewById(R.id.fab_2);
-        fab2.setOnCheckedChangeListener(this);
-        return rootView;
-    }
-
-
-    @Override
-    public void onCheckedChanged(FloatingActionButton fabView, boolean isChecked) {
-        // When a FAB is toggled, log the action.
-        switch (fabView.getId()){
-            case R.id.fab_1:
-                Log.d(TAG, String.format("FAB 1 was %s.", isChecked ? "checked" : "unchecked"));
-                break;
-            case R.id.fab_2:
-                Log.d(TAG, String.format("FAB 2 was %s.", isChecked ? "checked" : "unchecked"));
-                break;
-            default:
-                break;
-        }
-    }
-}

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/floatingactionbuttonbasic/MainActivity.java b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/floatingactionbuttonbasic/MainActivity.java
deleted file mode 100644
index b88fc7a..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/java/com/example/android/floatingactionbuttonbasic/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.floatingactionbuttonbasic;
-
-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();
-            FloatingActionButtonBasicFragment fragment = new FloatingActionButtonBasicFragment();
-            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/FloatingActionButtonBasic/Application/src/main/res/animator/fab_anim.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/animator/fab_anim.xml
deleted file mode 100644
index dd83cd3..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/animator/fab_anim.xml
+++ /dev/null

@@ -1,37 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:state_enabled="true" android:state_pressed="true">
-        <objectAnimator
-            android:duration="@android:integer/config_shortAnimTime"
-            android:propertyName="translationZ"
-            android:valueTo="@dimen/fab_press_translation_z"
-            android:valueType="floatType" />
-    </item>
-
-    <item>
-        <objectAnimator
-            android:duration="@android:integer/config_shortAnimTime"
-            android:propertyName="translationZ"
-            android:valueTo="0"
-            android:valueType="floatType" />
-    </item>
-
-</selector>
\ No newline at end of file

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 5832eda..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 08e272e..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 7803f2d..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_add.png b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_add.png
deleted file mode 100644
index f3166df..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_add.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index a1f819c..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_tick.png b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_tick.png
deleted file mode 100644
index 56f0454..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable-xxhdpi/ic_tick.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable/fab_background.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable/fab_background.xml
deleted file mode 100644
index e5e7dbc..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/drawable/fab_background.xml
+++ /dev/null

@@ -1,39 +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.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true">
-        <ripple android:color="@color/fab_color_2_muted">
-            <item>
-                <shape>
-                    <solid android:color="@color/fab_color_2" />
-                </shape>
-            </item>
-        </ripple>
-    </item>
-
-    <item>
-        <ripple android:color="@color/fab_color_1_muted">
-            <item>
-                <shape>
-                    <solid android:color="@color/fab_color_1" />
-                </shape>
-            </item>
-        </ripple>
-    </item>
-
-</selector>
\ No newline at end of file

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/layout-w720dp/activity_main.xml
deleted file mode 100755
index c9a52f6..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index 1ae4f98..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/res/layout/fab_layout.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/layout/fab_layout.xml
deleted file mode 100644
index ab8c7dc..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/layout/fab_layout.xml
+++ /dev/null

@@ -1,59 +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:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent" >
-
-    <com.example.android.floatingactionbuttonbasic.FloatingActionButton
-            android:id="@+id/fab_1"
-            android:layout_width="@dimen/fab_size"
-            android:layout_height="@dimen/fab_size"
-            android:layout_marginTop="16dp"
-            android:elevation="@dimen/fab_elevation"
-            android:background="@drawable/fab_background"
-            android:stateListAnimator="@animator/fab_anim"
-            android:layout_gravity="center_horizontal">
-
-        <ImageView
-                android:layout_width="@dimen/fab_icon_size"
-                android:layout_height="@dimen/fab_icon_size"
-                android:src="@drawable/fab_icons"
-                android:layout_gravity="center"
-                android:duplicateParentState="true"/>
-
-    </com.example.android.floatingactionbuttonbasic.FloatingActionButton>
-
-
-    <com.example.android.floatingactionbuttonbasic.FloatingActionButton
-            android:id="@+id/fab_2"
-            android:layout_width="@dimen/fab_size_small"
-            android:layout_height="@dimen/fab_size_small"
-            android:layout_marginTop="128dp"
-            android:elevation="@dimen/fab_elevation"
-            android:background="@drawable/fab_background"
-            android:stateListAnimator="@animator/fab_anim"
-            android:layout_gravity="center_horizontal">
-
-        <ImageView
-                android:layout_width="@dimen/fab_icon_size"
-                android:layout_height="@dimen/fab_icon_size"
-                android:src="@drawable/fab_icons"
-                android:layout_gravity="center"
-                android:duplicateParentState="true"/>
-
-    </com.example.android.floatingactionbuttonbasic.FloatingActionButton>
-</FrameLayout>

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/menu/main.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/menu/main.xml
deleted file mode 100644
index b49c2c5..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values-v11/template-styles.xml
deleted file mode 100644
index 8c1ea66..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 2eea10e..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,29 +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">FloatingActionButtonBasic</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            This sample shows the two sizes of Floating Action Buttons and how to interact with
-            them.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values/colors.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values/colors.xml
deleted file mode 100644
index 141b1f5..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values/colors.xml
+++ /dev/null

@@ -1,22 +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>
-    <color name="fab_color_1">#ff5252</color>
-    <color name="fab_color_1_muted">#ff8080</color>
-    <color name="fab_color_2">#9c27b0</color>
-    <color name="fab_color_2_muted">#a56ab0</color>
-</resources>
\ No newline at end of file

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values/fragmentview_strings.xml
deleted file mode 100755
index 7b9d9ec..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 6e7d593..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/FloatingActionButtonBasic/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 6027422..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,41 +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.
-  -->
-
-<!-- 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.floatingactionbuttonbasic.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.floatingactionbuttonbasic"
-            android:label="Tests for com.example.android.floatingactionbuttonbasic" />
-
-</manifest>

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
deleted file mode 100644
index a900485..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/Application/tests/src/com/example/android/floatingactionbuttonbasic/tests/SampleTests.java
+++ /dev/null

@@ -1,62 +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.floatingactionbuttonbasic.tests;
-
-import com.example.android.floatingactionbuttonbasic.*;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
-* Tests for FloatingActionButtonBasic sample.
-*/
-public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
-
-    private MainActivity mTestActivity;
-    private FloatingActionButton 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 = (FloatingActionButton)
-            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/FloatingActionButtonBasic/CONTRIB.md b/prebuilts/gradle/FloatingActionButtonBasic/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/LICENSE b/prebuilts/gradle/FloatingActionButtonBasic/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/build.gradle b/prebuilts/gradle/FloatingActionButtonBasic/build.gradle
deleted file mode 100644
index 5cf5d3d..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/build.gradle
+++ /dev/null

@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/FloatingActionButtonBasic/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/FloatingActionButtonBasic/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index fc0d638..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-#Tue Oct 14 12:13:20 MDT 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/gradlew b/prebuilts/gradle/FloatingActionButtonBasic/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/gradlew
+++ /dev/null

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/prebuilts/gradle/FloatingActionButtonBasic/gradlew.bat b/prebuilts/gradle/FloatingActionButtonBasic/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/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/FloatingActionButtonBasic/settings.gradle b/prebuilts/gradle/FloatingActionButtonBasic/settings.gradle
deleted file mode 100644
index 9464a35..0000000
--- a/prebuilts/gradle/FloatingActionButtonBasic/settings.gradle
+++ /dev/null

@@ -1 +0,0 @@
-include 'Application'

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MainActivity.java b/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MainActivity.java
deleted file mode 100644
index fa019be..0000000
--- a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/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.fragmenttransition;
-
-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();
-            FragmentTransitionFragment fragment = new FragmentTransitionFragment();
-            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/FragmentTransition/FragmentTransitionSample/build.gradle b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/FragmentTransitionSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/DetailFragment.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/DetailFragment.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/DetailFragment.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/DetailFragment.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/FragmentTransitionFragment.java

diff --git a/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MainActivity.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MainActivity.java
new file mode 100644
index 0000000..90e54b2
--- /dev/null
+++ b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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.fragmenttransition;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        FragmentTransitionFragment fragment = new FragmentTransitionFragment();
+        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/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/Meat.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/Meat.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/Meat.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/Meat.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/java/com/example/android/fragmenttransition/MeatAdapter.java

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p1.jpg b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p1.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p1.jpg
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p1.jpg
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p10.jpg b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p10.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p10.jpg
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p10.jpg
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p11.jpg b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p11.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p11.jpg
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p11.jpg
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p2.jpg b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p2.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p2.jpg
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p2.jpg
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p3.jpg b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p3.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p3.jpg
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p3.jpg
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p4.jpg b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p4.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p4.jpg
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p4.jpg
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p5.jpg b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p5.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p5.jpg
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p5.jpg
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p6.jpg b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p6.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p6.jpg
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p6.jpg
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p7.jpg b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p7.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p7.jpg
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p7.jpg
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p8.jpg b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p8.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p8.jpg
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p8.jpg
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p9.jpg b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p9.jpg
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-nodpi/p9.jpg
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-nodpi/p9.jpg
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_detail.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_detail.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_detail_content.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail_content.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_detail_content.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_detail_content.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_fragment_transition.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_fragment_transition.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/fragment_fragment_transition.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/fragment_fragment_transition.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/item_meat_grid.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/item_meat_grid.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/layout/item_meat_grid.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/layout/item_meat_grid.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/menu/main.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/strings.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/FragmentTransition/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/FragmentTransition/FragmentTransitionSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/FragmentTransition/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/FragmentTransition/gradle/wrapper/gradle-wrapper.properties
index 00daa77..4f5d419 100644
--- a/prebuilts/gradle/FragmentTransition/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/FragmentTransition/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/FragmentTransition/settings.gradle b/prebuilts/gradle/FragmentTransition/settings.gradle
index 9464a35..7e39b44 100644
--- a/prebuilts/gradle/FragmentTransition/settings.gradle
+++ b/prebuilts/gradle/FragmentTransition/settings.gradle

@@ -1 +1 @@
-include 'Application'
+include 'FragmentTransitionSample'

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/HorizontalPaging/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 1f6fdd2..0000000
--- a/prebuilts/gradle/HorizontalPaging/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,44 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.horizontalpaging"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <!-- While ViewPager will work on API 4 or above, tabs require an ActionBar. ActionBar is only
-         available in API 11 or above. -->
-    <!-- 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" >
-        <!-- This is a standard Activity invocation for MainActivity. -->
-        <activity
-            android:name="com.example.android.horizontalpaging.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/HorizontalPaging/Application/tests/AndroidManifest.xml b/prebuilts/gradle/HorizontalPaging/Application/tests/AndroidManifest.xml
deleted file mode 100644
index a8e7be5..0000000
--- a/prebuilts/gradle/HorizontalPaging/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.horizontalpaging.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.horizontalpaging"
-            android:label="Tests for com.example.android.horizontalpaging" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/build.gradle b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/HorizontalPaging/HorizontalPagingSample/src/main/AndroidManifest.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..33b9e15
--- /dev/null
+++ b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/AndroidManifest.xml

@@ -0,0 +1,46 @@
+<?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.horizontalpaging"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <!-- While ViewPager will work on API 4 or above, tabs require an ActionBar. ActionBar is only
+         available in API 11 or above. -->
+    <uses-sdk
+        android:minSdkVersion="11"
+        android:targetSdkVersion="16" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <!-- This is a standard Activity invocation for MainActivity. -->
+        <activity
+            android:name="com.example.android.horizontalpaging.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/HorizontalPaging/Application/src/main/java/com/example/android/horizontalpaging/MainActivity.java b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/java/com/example/android/horizontalpaging/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/java/com/example/android/horizontalpaging/MainActivity.java
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/java/com/example/android/horizontalpaging/MainActivity.java

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-hdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-mdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
similarity index 100%
rename from prebuilts/androidtv/leanback/app/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/fragment_main_dummy.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/fragment_main_dummy.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/fragment_main_dummy.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/fragment_main_dummy.xml

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/strings.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/values-sw720dp-land/dimens.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/src/main/res/values/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/src/main/res/values/values-sw720dp-land/dimens.xml

diff --git a/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/tests/AndroidManifest.xml b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..3f35ede
--- /dev/null
+++ b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.horizontalpaging.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.horizontalpaging"
+            android:label="Tests for com.example.android.horizontalpaging" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/HorizontalPaging/Application/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java b/prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/HorizontalPaging/Application/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java
rename to prebuilts/gradle/HorizontalPaging/HorizontalPagingSample/tests/src/com/example/android/horizontalpaging/tests/SampleTests.java

diff --git a/prebuilts/gradle/HorizontalPaging/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/HorizontalPaging/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/HorizontalPaging/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/HorizontalPaging/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/HorizontalPaging/settings.gradle b/prebuilts/gradle/HorizontalPaging/settings.gradle
index 9464a35..f70f0f1 100644
--- a/prebuilts/gradle/HorizontalPaging/settings.gradle
+++ b/prebuilts/gradle/HorizontalPaging/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'HorizontalPagingSample'

diff --git a/prebuilts/gradle/ImmersiveMode/Application/tests/AndroidManifest.xml b/prebuilts/gradle/ImmersiveMode/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 9125fed..0000000
--- a/prebuilts/gradle/ImmersiveMode/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.immersivemode.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.immersivemode"
-            android:label="Tests for com.example.android.immersivemode" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/build.gradle b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/ImmersiveMode/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/ImmersiveModeFragment.java

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/MainActivity.java b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/java/com/example/android/immersivemode/MainActivity.java
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/java/com/example/android/immersivemode/MainActivity.java

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout-sw600dp-land/activity_main.xml

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout-sw600dp/activity_main.xml

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/menu/main.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/strings.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/AndroidManifest.xml b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..b090189
--- /dev/null
+++ b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.immersivemode.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.immersivemode"
+            android:label="Tests for com.example.android.immersivemode" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/ImmersiveModeSampleTests.java

diff --git a/prebuilts/gradle/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/SampleTests.java b/prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/ImmersiveMode/Application/tests/src/com/example/android/immersivemode/tests/SampleTests.java
rename to prebuilts/gradle/ImmersiveMode/ImmersiveModeSample/tests/src/com/example/android/immersivemode/tests/SampleTests.java

diff --git a/prebuilts/gradle/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/ImmersiveMode/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/ImmersiveMode/settings.gradle b/prebuilts/gradle/ImmersiveMode/settings.gradle
index 9464a35..d13a7a1 100644
--- a/prebuilts/gradle/ImmersiveMode/settings.gradle
+++ b/prebuilts/gradle/ImmersiveMode/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'ImmersiveModeSample'

diff --git a/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
deleted file mode 100644
index 3228927..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/common/logger/Log.java
deleted file mode 100644
index 17503c5..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/common/logger/LogFragment.java
deleted file mode 100644
index b302acd..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/common/logger/LogNode.java
deleted file mode 100644
index bc37cab..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/common/logger/LogView.java
deleted file mode 100644
index c01542b..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
deleted file mode 100644
index 16a9e7b..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
deleted file mode 100644
index 19967dc..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/java/com/example/android/interpolator/InterpolatorFragment.java b/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/interpolator/InterpolatorFragment.java
deleted file mode 100644
index 07ecc95..0000000
--- a/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/interpolator/InterpolatorFragment.java
+++ /dev/null

@@ -1,244 +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.interpolator;
-
-import android.animation.ObjectAnimator;
-import android.graphics.Path;
-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.AnimationUtils;
-import android.view.animation.Interpolator;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.SeekBar;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.example.android.common.logger.Log;
-
-/**
- * This sample demonstrates the use of animation interpolators and path animations for
- * Material Design.
- * It shows how an {@link android.animation.ObjectAnimator} is used to animate two properties of a
- * view (scale X and Y) along a path.
- */
-public class InterpolatorFragment extends Fragment {
-
-    /**
-     * View that is animated.
-     */
-    private View mView;
-    /**
-     * Spinner for selection of interpolator.
-     */
-    private Spinner mInterpolatorSpinner;
-    /**
-     * SeekBar for selection of duration of animation.
-     */
-    private SeekBar mDurationSeekbar;
-    /**
-     * TextView that shows animation selected in SeekBar.
-     */
-    private TextView mDurationLabel;
-
-    /**
-     * Interpolators used for animation.
-     */
-    private Interpolator mInterpolators[];
-    /**
-     * Path for in (shrinking) animation, from 100% scale to 20%.
-     */
-    private Path mPathIn;
-    /**
-     * Path for out (growing) animation, from 20% to 100%.
-     */
-    private Path mPathOut;
-
-    /**
-     * Set to true if View is animated out (is shrunk).
-     */
-    private boolean mIsOut = false;
-
-    /**
-     * Default duration of animation in ms.
-     */
-    private static final int INITIAL_DURATION_MS = 750;
-
-    /**
-     * String used for logging.
-     */
-    public static final String TAG = "InterpolatorplaygroundFragment";
-
-    public InterpolatorFragment() {
-        // Required empty public constructor
-    }
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-
-        // Inflate the fragment_animation layout
-        View v = inflater.inflate(R.layout.interpolator_fragment, container, false);
-
-        // Set up the 'animate' button, when it is clicked the view is animated with the options
-        // selected: the Interpolator, duration and animation path
-        Button button = (Button) v.findViewById(R.id.animateButton);
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                // Interpolator selected in the spinner
-                Interpolator interpolator = mInterpolators[mInterpolatorSpinner.getSelectedItemPosition()];
-                // Duration selected in SeekBar
-                long duration = mDurationSeekbar.getProgress();
-                // Animation path is based on whether animating in or out
-                Path path = mIsOut ? mPathIn : mPathOut;
-
-                // Log animation details
-                Log.i(TAG, String.format("Starting animation: [%d ms, %s, %s]",
-                        duration, (String) mInterpolatorSpinner.getSelectedItem(),
-                        ((mIsOut) ? "Out (growing)" : "In (shrinking)")));
-
-                // Start the animation with the selected options
-                startAnimation(interpolator, duration, path);
-
-                // Toggle direction of animation (path)
-                mIsOut = !mIsOut;
-            }
-        });
-
-        // Get the label to display the selected duration
-        mDurationLabel = (TextView) v.findViewById(R.id.durationLabel);
-
-        // Initialize Interpolators programmatically by loading them from their XML definitions
-        // provided by the framework.
-        mInterpolators = new Interpolator[]{
-                new AnimationUtils().loadInterpolator(getActivity(),
-                        android.R.interpolator.linear),
-                new AnimationUtils().loadInterpolator(getActivity(),
-                        android.R.interpolator.fast_out_linear_in),
-                new AnimationUtils().loadInterpolator(getActivity(),
-                        android.R.interpolator.fast_out_slow_in),
-                new AnimationUtils().loadInterpolator(getActivity(),
-                        android.R.interpolator.linear_out_slow_in)
-        };
-
-        // Load names of interpolators from a resource
-        String[] interpolatorNames = getResources().getStringArray(R.array.interpolator_names);
-
-        // Set up the Spinner with the names of interpolators
-        mInterpolatorSpinner = (Spinner) v.findViewById(R.id.interpolatorSpinner);
-        ArrayAdapter<String> spinnerAdapter =
-                new ArrayAdapter<String>(getActivity(),
-                        android.R.layout.simple_spinner_dropdown_item, interpolatorNames);
-        mInterpolatorSpinner.setAdapter(spinnerAdapter);
-
-        // Set up SeekBar that defines the duration of the animation
-        mDurationSeekbar = (SeekBar) v.findViewById(R.id.durationSeek);
-
-        // Register listener to update the text label when the SeekBar value is updated
-        mDurationSeekbar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int i, boolean b) {
-                mDurationLabel.setText(getResources().getString(R.string.animation_duration, i));
-            }
-
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {
-            }
-
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-            }
-        });
-
-        // Set initial progress to trigger SeekBarChangeListener and update UI
-        mDurationSeekbar.setProgress(INITIAL_DURATION_MS);
-
-        // Get the view that will be animated
-        mView = v.findViewById(R.id.square);
-
-        // The following Path definitions are used by the ObjectAnimator to scale the view.
-
-        // Path for 'in' animation: growing from 20% to 100%
-        mPathIn = new Path();
-        mPathIn.moveTo(0.2f, 0.2f);
-        mPathIn.lineTo(1f, 1f);
-
-        // Path for 'out' animation: shrinking from 100% to 20%
-        mPathOut = new Path();
-        mPathOut.moveTo(1f, 1f);
-        mPathOut.lineTo(0.2f, 0.2f);
-        return v;
-    }
-
-    /**
-     * Start an animation on the sample view.
-     * The view is animated using an {@link android.animation.ObjectAnimator} on the
-     * {@link View#SCALE_X} and {@link View#SCALE_Y} properties, with its animation based on a path.
-     * The only two paths defined here ({@link #mPathIn} and {@link #mPathOut}) scale the view
-     * uniformly.
-     *
-     * @param interpolator The interpolator to use for the animation.
-     * @param duration     Duration of the animation in ms.
-     * @param path         Path of the animation
-     * @return The ObjectAnimator used for this animation
-     * @see android.animation.ObjectAnimator#ofFloat(Object, String, String, android.graphics.Path)
-     */
-    public ObjectAnimator startAnimation(Interpolator interpolator, long duration, Path path) {
-        // This ObjectAnimator uses the path to change the x and y scale of the mView object.
-        ObjectAnimator animator = ObjectAnimator.ofFloat(mView, View.SCALE_X, View.SCALE_Y, path);
-
-        // Set the duration and interpolator for this animation
-        animator.setDuration(duration);
-        animator.setInterpolator(interpolator);
-
-        animator.start();
-
-        return animator;
-    }
-
-    /**
-     * Return the array of loaded Interpolators available in this Fragment.
-     *
-     * @return Interpolators
-     */
-    public Interpolator[] getInterpolators() {
-        return mInterpolators;
-    }
-
-    /**
-     * Return the animation path for the 'in' (shrinking) animation.
-     *
-     * @return
-     */
-    public Path getPathIn() {
-        return mPathIn;
-    }
-
-    /**
-     * Return the animation path for the 'out' (growing) animation.
-     *
-     * @return
-     */
-    public Path getPathOut() {
-        return mPathOut;
-    }
-}
\ No newline at end of file

diff --git a/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/interpolator/MainActivity.java b/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/interpolator/MainActivity.java
deleted file mode 100644
index f71fd05..0000000
--- a/prebuilts/gradle/Interpolator/Application/src/main/java/com/example/android/interpolator/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.interpolator;
-
-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();
-            InterpolatorFragment fragment = new InterpolatorFragment();
-            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/Interpolator/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 14a1e3a..0000000
--- a/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index e328c42..0000000
--- a/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index c78e0c4..0000000
--- a/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 0be3d8b..0000000
--- a/prebuilts/gradle/Interpolator/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/Interpolator/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/layout-w720dp/activity_main.xml
deleted file mode 100755
index c9a52f6..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index 1ae4f98..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/res/layout/interpolator_fragment.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/layout/interpolator_fragment.xml
deleted file mode 100644
index 6e1cb04..0000000
--- a/prebuilts/gradle/Interpolator/Application/src/main/res/layout/interpolator_fragment.xml
+++ /dev/null

@@ -1,86 +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.
--->
-
-<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"
-    android:paddingBottom="@dimen/vertical_page_margin"
-    android:paddingLeft="@dimen/horizontal_page_margin"
-    android:paddingRight="@dimen/horizontal_page_margin"
-    android:paddingTop="@dimen/vertical_page_margin">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView
-            android:id="@+id/interpolatorLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/interpolatorSpinner"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:gravity="center_vertical"
-            android:text="@string/interpolator" />
-
-        <Spinner
-            android:id="@+id/interpolatorSpinner"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_toEndOf="@+id/interpolatorLabel" />
-
-
-        <SeekBar
-            android:id="@+id/durationSeek"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_below="@+id/durationLabel"
-            android:max="5000" />
-
-        <TextView
-            android:id="@+id/durationLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_below="@+id/interpolatorSpinner"
-            android:gravity="center_vertical" />
-
-        <Button
-            android:id="@+id/animateButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/durationSeek"
-            android:layout_centerHorizontal="true"
-            android:text="@string/animate" />
-
-        <View
-            android:id="@+id/square"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentBottom="true"
-            android:layout_below="@+id/animateButton"
-            android:layout_centerHorizontal="true"
-            android:layout_margin="10dp"
-            android:background="@color/purple"
-            android:minHeight="100dp"
-            android:minWidth="100dp" />
-
-    </RelativeLayout>
-
-</ScrollView>
\ No newline at end of file

diff --git a/prebuilts/gradle/Interpolator/Application/src/main/res/menu/main.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/menu/main.xml
deleted file mode 100644
index b49c2c5..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/values-v11/template-styles.xml
deleted file mode 100644
index 8c1ea66..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 4997667..0000000
--- a/prebuilts/gradle/Interpolator/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,30 +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">Interpolator</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            This sample demonstrates the use of animation interpolators and path animations for
-            Material Design. It shows how an ObjectAnimator is used to animate two properties of a
-            view (scale X and Y) along a path.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/Interpolator/Application/src/main/res/values/color.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/values/color.xml
deleted file mode 100644
index aa18437..0000000
--- a/prebuilts/gradle/Interpolator/Application/src/main/res/values/color.xml
+++ /dev/null

@@ -1,19 +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>
-    <color name="purple">#9c27b0</color>
-</resources>
\ No newline at end of file

diff --git a/prebuilts/gradle/Interpolator/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/values/fragmentview_strings.xml
deleted file mode 100755
index 7b9d9ec..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/res/values/strings.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/values/strings.xml
deleted file mode 100644
index e2cfb2a..0000000
--- a/prebuilts/gradle/Interpolator/Application/src/main/res/values/strings.xml
+++ /dev/null

@@ -1,27 +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="animation_duration">Duration: %1$d ms</string>
-    <string name="interpolator">Interpolator:</string>
-    <string name="animate">Animate!</string>
-    <string-array name="interpolator_names">
-        <item>Linear</item>
-        <item>Fast Out Linear In</item>
-        <item>Fast Out Slow In</item>
-        <item>Linear Out Slow In</item>
-    </string-array>
-</resources>
\ No newline at end of file

diff --git a/prebuilts/gradle/Interpolator/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/Interpolator/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 6e7d593..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/Application/tests/AndroidManifest.xml b/prebuilts/gradle/Interpolator/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 5e43ab9..0000000
--- a/prebuilts/gradle/Interpolator/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,41 +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.
--->
-
-<!-- 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.interpolatorplayground.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.interpolatorplayground"
-            android:label="Tests for com.example.android.interpolatorplayground" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/Interpolator/Application/tests/src/com/example/android/interpolatorplayground/tests/SampleTests.java b/prebuilts/gradle/Interpolator/Application/tests/src/com/example/android/interpolatorplayground/tests/SampleTests.java
deleted file mode 100644
index 7a0264b..0000000
--- a/prebuilts/gradle/Interpolator/Application/tests/src/com/example/android/interpolatorplayground/tests/SampleTests.java
+++ /dev/null

@@ -1,115 +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.interpolatorplayground.tests;
-
-import com.example.android.interpolator.InterpolatorFragment;
-import com.example.android.interpolatorplayground.*;
-
-import android.animation.ObjectAnimator;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.view.animation.Interpolator;
-import android.widget.SeekBar;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-/**
- * Tests for interpolatorplayground sample.
- */
-public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
-
-    private MainActivity mTestActivity;
-    private InterpolatorFragment mTestFragment;
-
-    public SampleTests() {
-        super(MainActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        setActivityInitialTouchMode(true);
-
-        // 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 = (InterpolatorFragment)
-                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);
-    }
-
-    /**
-     * Test if all UI elements have been set up correctly.
-     */
-    public void testInitialisation() {
-        final int initialDuration = 750;
-        final String initialInterpolator = "Linear";
-
-        SeekBar durationBar = (SeekBar) getActivity().findViewById(R.id.durationSeek);
-        TextView durationLabel = (TextView) getActivity().findViewById(R.id.durationLabel);
-        Spinner interpolateSpinner = (Spinner) getActivity().findViewById(R.id.interpolatorSpinner);
-        Interpolator[] interpolators = mTestFragment.getInterpolators();
-
-        // Duration in progress bar
-        assertEquals(durationBar.getProgress(), initialDuration);
-        // Duration label
-        assertEquals(durationLabel.getText().toString(), getActivity().getResources().getString(R.string.animation_duration, initialDuration));
-        // Initial Interpolator
-        assertEquals((String) interpolateSpinner.getSelectedItem(), initialInterpolator);
-
-        // The number of loaded interpolators has to match the number of entries in the spinner
-        assertEquals(interpolators.length, interpolateSpinner.getCount());
-        // Test that all interpolators have been loaded
-        for (Interpolator i : interpolators) {
-            assertNotNull(i);
-        }
-
-    }
-
-    /**
-     * Test if all Interpolators can be used to start an animation.
-     */
-    @UiThreadTest
-    public void testStartInterpolators() {
-
-        // Start an animation for each interpolator
-        final Interpolator[] interpolators = mTestFragment.getInterpolators();
-
-        for (final Interpolator i : interpolators) {
-            // Start the animation
-            ObjectAnimator animator = mTestFragment.startAnimation(i, 1000L, mTestFragment.getPathIn());
-            // Check that the correct interpolator is used for the animation
-            assertEquals(i, animator.getInterpolator());
-            // Verify the animation has started
-            assertTrue(animator.isStarted());
-            // Cancel before starting the next animation
-            animator.cancel();
-        }
-    }
-}
\ No newline at end of file

diff --git a/prebuilts/gradle/Interpolator/CONTRIB.md b/prebuilts/gradle/Interpolator/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/LICENSE b/prebuilts/gradle/Interpolator/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/README.md b/prebuilts/gradle/Interpolator/README.md
deleted file mode 100644
index faf9086..0000000
--- a/prebuilts/gradle/Interpolator/README.md
+++ /dev/null

@@ -1,51 +0,0 @@
-Android Interpolator Sample
-==============================
-
-This sample demonstrates the use of animation interpolators and path animations for
-Material Design. It shows how an ObjectAnimator is used to animate two properties of a
-view (scale X and Y) along a path.
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-Interpolator
-
-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/Interpolator/build.gradle b/prebuilts/gradle/Interpolator/build.gradle
deleted file mode 100644
index 5cf5d3d..0000000
--- a/prebuilts/gradle/Interpolator/build.gradle
+++ /dev/null

@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/prebuilts/gradle/Interpolator/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/Interpolator/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/gradle/Interpolator/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/Interpolator/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/Interpolator/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 56f685a..0000000
--- a/prebuilts/gradle/Interpolator/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-#Wed Apr 10 15:27:10 PDT 2013
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/Interpolator/gradlew b/prebuilts/gradle/Interpolator/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/Interpolator/gradlew
+++ /dev/null

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/prebuilts/gradle/Interpolator/gradlew.bat b/prebuilts/gradle/Interpolator/gradlew.bat
deleted file mode 100644
index 8a0b282..0000000
--- a/prebuilts/gradle/Interpolator/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/Interpolator/packaging.yaml b/prebuilts/gradle/Interpolator/packaging.yaml
deleted file mode 100644
index 962ed1b..0000000
--- a/prebuilts/gradle/Interpolator/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-Interpolator
-level:        BEGINNER
-icon:         InterpolatorSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2

diff --git a/prebuilts/gradle/Interpolator/settings.gradle b/prebuilts/gradle/Interpolator/settings.gradle
deleted file mode 100644
index 9464a35..0000000
--- a/prebuilts/gradle/Interpolator/settings.gradle
+++ /dev/null

@@ -1 +0,0 @@
-include 'Application'

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/JobScheduler/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 06a927b..0000000
--- a/prebuilts/gradle/JobScheduler/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,46 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.jobscheduler" >
-
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:windowSoftInputMode="stateHidden" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <service
-            android:name=".service.TestJobService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="true"/>
-    </application>
-
-</manifest>

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/JobScheduler/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 90ee18a..0000000
--- a/prebuilts/gradle/JobScheduler/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,29 +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">JobScheduler</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            Demonstration of the JobScheduler API, which provides an interface for scheduling
-            background tasks when certain tasks apply.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/JobScheduler/Application/tests/AndroidManifest.xml b/prebuilts/gradle/JobScheduler/Application/tests/AndroidManifest.xml
deleted file mode 100644
index bb06508..0000000
--- a/prebuilts/gradle/JobScheduler/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.jobscheduler.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.jobscheduler"
-            android:label="Tests for com.example.android.jobscheduler" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/JobScheduler/CONTRIB.md b/prebuilts/gradle/JobScheduler/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/JobScheduler/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/JobScheduler/JobSchedulerSample/JobSchedulerSample.iml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/JobSchedulerSample.iml
new file mode 100644
index 0000000..35113e3
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/JobSchedulerSample.iml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="JobScheduler" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":JobSchedulerSample" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/template/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/common/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/template/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/common/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/template/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/assets" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build.gradle b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build.gradle
new file mode 100644
index 0000000..d74a6db
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build.gradle

@@ -0,0 +1,66 @@
+
+
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+repositories {
+    jcenter()
+}
+
+
+dependencies {
+
+
+
+}
+
+// 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 "android-L"
+
+    buildToolsVersion "19.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/JobScheduler/JobSchedulerSample/build/generated/source/r/debug/com/example/android/jobscheduler/R.java b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/generated/source/r/debug/com/example/android/jobscheduler/R.java
new file mode 100644
index 0000000..40369f2
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/generated/source/r/debug/com/example/android/jobscheduler/R.java

@@ -0,0 +1,87 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.example.android.jobscheduler;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class color {
+        public static final int none_received=0x7f040000;
+        public static final int start_received=0x7f040001;
+        public static final int stop_received=0x7f040002;
+    }
+    public static final class dimen {
+        public static final int horizontal_page_margin=0x7f050000;
+        public static final int margin_huge=0x7f050001;
+        public static final int margin_large=0x7f050002;
+        public static final int margin_medium=0x7f050003;
+        public static final int margin_small=0x7f050004;
+        public static final int margin_tiny=0x7f050005;
+        public static final int vertical_page_margin=0x7f050006;
+    }
+    public static final class drawable {
+        public static final int ic_launcher=0x7f020000;
+        public static final int tile=0x7f020001;
+    }
+    public static final class id {
+        public static final int cancel_button=0x7f08000b;
+        public static final int checkbox_any=0x7f080004;
+        public static final int checkbox_charging=0x7f080008;
+        public static final int checkbox_idle=0x7f080009;
+        public static final int checkbox_unmetered=0x7f080005;
+        public static final int deadline_time=0x7f080007;
+        public static final int delay_time=0x7f080006;
+        public static final int finished_button=0x7f080002;
+        public static final int onstart_textview=0x7f080000;
+        public static final int onstop_textview=0x7f080001;
+        public static final int schedule_button=0x7f08000a;
+        public static final int task_params=0x7f080003;
+    }
+    public static final class layout {
+        public static final int activity_main=0x7f030000;
+        public static final int sample_main=0x7f030001;
+    }
+    public static final class string {
+        public static final int any=0x7f060000;
+        public static final int app_name=0x7f060001;
+        public static final int cancel_all_jobs_button_text=0x7f060002;
+        public static final int charging_caption=0x7f060003;
+        public static final int charging_text=0x7f060004;
+        public static final int connectivity=0x7f060005;
+        public static final int constraints=0x7f060006;
+        public static final int deadline=0x7f060007;
+        public static final int defaultparamtext=0x7f060008;
+        public static final int delay=0x7f060009;
+        public static final int finish_job_button_text=0x7f06000a;
+        public static final int idle_caption=0x7f06000b;
+        public static final int idle_mode_text=0x7f06000c;
+        public static final int intro_message=0x7f06000d;
+        public static final int onstarttask=0x7f06000e;
+        public static final int onstoptask=0x7f06000f;
+        public static final int schedule_job_button_text=0x7f060010;
+        public static final int timing=0x7f060011;
+        public static final int unmetered=0x7f060012;
+    }
+    public static final class style {
+        /** 
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        
+ API 11 theme customizations can go here. 
+ API 14 theme customizations can go here. 
+         */
+        public static final int AppBaseTheme=0x7f070000;
+        public static final int AppTheme=0x7f070001;
+        public static final int Theme_Base=0x7f070002;
+        public static final int Theme_Sample=0x7f070003;
+        public static final int Widget=0x7f070004;
+        public static final int Widget_SampleMessage=0x7f070005;
+        public static final int Widget_SampleMessageTile=0x7f070006;
+    }
+}

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/Log.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/Log.class
new file mode 100644
index 0000000..31f936d
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/Log.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogFragment$1.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogFragment$1.class
new file mode 100644
index 0000000..12c49fb
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogFragment$1.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogFragment.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogFragment.class
new file mode 100644
index 0000000..a260207
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogFragment.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogView.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogView.class
new file mode 100644
index 0000000..268fb2b
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogView.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogWrapper.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogWrapper.class
new file mode 100644
index 0000000..df70cc7
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/LogWrapper.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/MessageOnlyLogFilter.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/MessageOnlyLogFilter.class
new file mode 100644
index 0000000..7d93c98
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/common/logger/MessageOnlyLogFilter.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/MainActivity$1.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/MainActivity$1.class
new file mode 100644
index 0000000..c1096e8
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/MainActivity$1.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/MainActivity.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/MainActivity.class
new file mode 100644
index 0000000..b993dc3
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/MainActivity.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$attr.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$attr.class
new file mode 100644
index 0000000..cb61a99
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$attr.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$color.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$color.class
new file mode 100644
index 0000000..16f9f7d
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$color.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$dimen.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$dimen.class
new file mode 100644
index 0000000..6779633
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$dimen.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$drawable.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$drawable.class
new file mode 100644
index 0000000..a98dc3a
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$drawable.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$id.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$id.class
new file mode 100644
index 0000000..3d14e59
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$id.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$layout.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$layout.class
new file mode 100644
index 0000000..57e6325
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$layout.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$string.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$string.class
new file mode 100644
index 0000000..119cca3
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$string.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$style.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$style.class
new file mode 100644
index 0000000..652505f
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R$style.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R.class
new file mode 100644
index 0000000..864b1c4
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/R.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/service/TestJobService.class b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/service/TestJobService.class
new file mode 100644
index 0000000..c44949c
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/classes/debug/com/example/android/jobscheduler/service/TestJobService.class
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/dex/debug/classes.dex b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/dex/debug/classes.dex
new file mode 100644
index 0000000..959c0b2
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/dex/debug/classes.dex
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/incremental/mergeAssets/debug/merger.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/incremental/mergeAssets/debug/merger.xml
new file mode 100644
index 0000000..2d18d3d
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/incremental/mergeAssets/debug/merger.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="2" >
+
+    <dataSet config="main" >
+        <source path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/assets" />
+    </dataSet>
+    <dataSet config="debug" >
+        <source path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/debug/assets" />
+    </dataSet>
+
+</merger>

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/incremental/mergeResources/debug/merger.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/incremental/mergeResources/debug/merger.xml
new file mode 100644
index 0000000..44514a5
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/incremental/mergeResources/debug/merger.xml

@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merger version="2" >
+
+    <dataSet config="main" >
+        <source path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res" >
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values-v14/styles.xml"
+                qualifiers="v14" >
+
+                <style
+                    name="AppBaseTheme"
+                    parent="android:Theme.Holo.Light.DarkActionBar" >
+
+                    <!-- API 14 theme customizations can go here. -->
+                </style>
+            </file>
+            <file
+                name="ic_launcher"
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/drawable-xhdpi/ic_launcher.png"
+                qualifiers="xhdpi-v4"
+                type="drawable" />
+            <file
+                name="ic_launcher"
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/drawable-hdpi/ic_launcher.png"
+                qualifiers="hdpi-v4"
+                type="drawable" />
+            <file
+                name="sample_main"
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/layout/sample_main.xml"
+                qualifiers=""
+                type="layout" />
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values-v11/styles.xml"
+                qualifiers="v11" >
+
+                <style
+                    name="AppBaseTheme"
+                    parent="android:Theme.Holo.Light" >
+
+                    <!-- API 11 theme customizations can go here. -->
+                </style>
+            </file>
+            <file
+                name="ic_launcher"
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/drawable-xxhdpi/ic_launcher.png"
+                qualifiers="xxhdpi-v4"
+                type="drawable" />
+            <file
+                name="ic_launcher"
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/drawable-mdpi/ic_launcher.png"
+                qualifiers="mdpi-v4"
+                type="drawable" />
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values/styles.xml"
+                qualifiers="" >
+
+                <style
+                    name="AppBaseTheme"
+                    parent="android:Theme.Light" >
+
+                    <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+                    -->
+                </style>
+            </file>
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values/color.xml"
+                qualifiers="" >
+                <color name="start_received" >#00FF00
+                </color>
+                <color name="none_received" >#999999
+                </color>
+                <color name="stop_received" >#FF0000
+                </color>
+            </file>
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values/strings.xml"
+                qualifiers="" >
+                <string name="charging_caption" >Charging:
+                </string>
+                <string name="idle_mode_text" >Requires device in idle mode.
+                </string>
+                <string name="unmetered" >WiFi
+                </string>
+                <string name="idle_caption" >Idle:
+                </string>
+                <string name="delay" >Delay:
+                </string>
+                <string name="timing" >Timing:
+                </string>
+                <string name="any" >Any
+                </string>
+                <string name="charging_text" >Requires device plugged in.
+                </string>
+                <string name="deadline" >Deadline:
+                </string>
+                <string name="connectivity" >Connectivity:
+                </string>
+                <string name="onstoptask" >onStopTask
+                </string>
+                <string name="defaultparamtext" >task params will show up here.
+                </string>
+                <string name="schedule_job_button_text" >Schedule Job
+                </string>
+                <string name="constraints" >Constraints
+                </string>
+                <string name="onstarttask" >onStartTask
+                </string>
+                <string name="cancel_all_jobs_button_text" >Cancel all
+                </string>
+                <string name="finish_job_button_text" >taskFinished
+                </string>
+            </file>
+        </source>
+        <source path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/common/res" />
+        <source path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res" >
+            <file
+                name="tile"
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/drawable-hdpi/tile.9.png"
+                qualifiers="hdpi-v4"
+                type="drawable" />
+            <file
+                name="activity_main"
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/layout/activity_main.xml"
+                qualifiers=""
+                type="layout" />
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values-sw600dp/template-dimens.xml"
+                qualifiers="sw600dp-v13" >
+                <dimen name="horizontal_page_margin" >@dimen/margin_huge
+                </dimen>
+                <dimen name="vertical_page_margin" >@dimen/margin_medium
+                </dimen>
+            </file>
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values-sw600dp/template-styles.xml"
+                qualifiers="sw600dp-v13" >
+
+                <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>
+            </file>
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values-v11/template-styles.xml"
+                qualifiers="v11" >
+
+                <style
+                    name="Theme.Base"
+                    parent="android:Theme.Holo.Light" />
+            </file>
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values-v21/template-styles.xml"
+                qualifiers="v21" >
+
+                <style
+                    name="Theme.Base"
+                    parent="android:Theme.Material.Light" />
+            </file>
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values/base-strings.xml"
+                qualifiers="" >
+                <string name="app_name" >JobScheduler
+                </string>
+                <string name="intro_message" >
+<![CDATA[
+        
+            
+            Demonstration of the JobScheduler API, which provides an interface for scheduling
+            background tasks when certain tasks apply.
+            
+        
+        ]]>
+                </string>
+            </file>
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values/template-dimens.xml"
+                qualifiers="" >
+                <dimen name="margin_huge" >64dp
+                </dimen>
+                <dimen name="margin_tiny" >4dp
+                </dimen>
+                <dimen name="horizontal_page_margin" >@dimen/margin_medium
+                </dimen>
+                <dimen name="margin_large" >32dp
+                </dimen>
+                <dimen name="margin_medium" >16dp
+                </dimen>
+                <dimen name="vertical_page_margin" >@dimen/margin_medium
+                </dimen>
+                <dimen name="margin_small" >8dp
+                </dimen>
+            </file>
+            <file
+                path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values/template-styles.xml"
+                qualifiers="" >
+
+                <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>
+
+                <style
+                    name="Theme.Base"
+                    parent="android:Theme.Light" />
+
+                <style
+                    name="Theme.Sample"
+                    parent="Theme.Base" />
+
+                <style
+                    name="AppTheme"
+                    parent="Theme.Sample" />
+            </file>
+        </source>
+        <source path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/build/generated/res/rs/debug" />
+        <source path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/build/generated/res/generated/debug" />
+    </dataSet>
+    <dataSet config="debug" >
+        <source path="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/debug/res" />
+    </dataSet>
+
+</merger>

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/libs/JobSchedulerSample-debug.ap_ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/libs/JobSchedulerSample-debug.ap_
new file mode 100644
index 0000000..a11a435
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/libs/JobSchedulerSample-debug.ap_
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/pre-dexed/debug/support-v13-19.1.0-8bb550a1ea8426f24c63a6254eb56dc4611a86d8.jar b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/pre-dexed/debug/support-v13-19.1.0-8bb550a1ea8426f24c63a6254eb56dc4611a86d8.jar
new file mode 100644
index 0000000..ebdf99f
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/pre-dexed/debug/support-v13-19.1.0-8bb550a1ea8426f24c63a6254eb56dc4611a86d8.jar
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/pre-dexed/debug/support-v4-19.1.0-1bd09adae01d10f8f097a7c54535018843cfa550.jar b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/pre-dexed/debug/support-v4-19.1.0-1bd09adae01d10f8f097a7c54535018843cfa550.jar
new file mode 100644
index 0000000..96541c0
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/pre-dexed/debug/support-v4-19.1.0-1bd09adae01d10f8f097a7c54535018843cfa550.jar
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-hdpi-v4/ic_launcher.png b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-hdpi-v4/ic_launcher.png
new file mode 100644
index 0000000..d9a1742
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-hdpi-v4/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-hdpi-v4/tile.9.png b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-hdpi-v4/tile.9.png
new file mode 100644
index 0000000..f2f5135
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-hdpi-v4/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-mdpi-v4/ic_launcher.png b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-mdpi-v4/ic_launcher.png
new file mode 100644
index 0000000..6295973
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-mdpi-v4/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-xhdpi-v4/ic_launcher.png b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-xhdpi-v4/ic_launcher.png
new file mode 100644
index 0000000..4e42fdc
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-xhdpi-v4/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_launcher.png b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_launcher.png
new file mode 100644
index 0000000..87034a3
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/drawable-xxhdpi-v4/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/layout/activity_main.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/layout/activity_main.xml
new file mode 100644
index 0000000..ad2a018
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/layout/activity_main.xml

@@ -0,0 +1,37 @@
+<!--
+  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>
+<!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/layout/activity_main.xml -->
\ No newline at end of file

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/layout/sample_main.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/layout/sample_main.xml
new file mode 100644
index 0000000..3741de0
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/layout/sample_main.xml

@@ -0,0 +1,180 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+            <TextView
+                android:id="@+id/onstart_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@color/none_received"
+                android:gravity="center"
+                android:text="@string/onstarttask"/>
+            <TextView
+                android:id="@+id/onstop_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@color/none_received"
+                android:gravity="center"
+                android:text="@string/onstoptask"/>
+        </LinearLayout>
+        <Button
+            android:id="@+id/finished_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="20dp"
+            android:layout_marginBottom="5dp"
+            android:onClick="finishJob"
+            android:text="@string/finish_job_button_text"/>
+
+        <TextView
+            android:id="@+id/task_params"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/defaultparamtext"
+            android:gravity="center"
+            android:textSize="20dp"
+
+            android:padding="15dp"
+            android:layout_marginBottom="10dp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/constraints"
+            android:layout_margin="15dp"
+            android:textSize="18dp"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginLeft="10dp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/connectivity"
+                    android:layout_marginRight="10dp"/>
+                <RadioGroup
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+                    <RadioButton android:id="@+id/checkbox_any"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/any"/>
+                    <RadioButton android:id="@+id/checkbox_unmetered"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/unmetered"/>
+                </RadioGroup>
+
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/timing"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15dp"
+                    android:textSize="17dp"
+                    android:text="@string/delay"/>
+                <EditText
+                    android:id="@+id/delay_time"
+                    android:layout_width="60dp"
+                    android:layout_height="wrap_content"
+                    android:inputType="number"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/deadline"
+                    android:textSize="17dp"/>
+                <EditText
+                    android:id="@+id/deadline_time"
+                    android:layout_width="60dp"
+                    android:layout_height="wrap_content"
+                    android:inputType="number"/>
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/charging_caption"
+                    android:layout_marginRight="15dp"/>
+                <CheckBox
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/checkbox_charging"
+                    android:text="@string/charging_text"/>
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/idle_caption"
+                    android:layout_marginRight="15dp"/>
+                <CheckBox
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/checkbox_idle"
+                    android:text="@string/idle_mode_text"/>
+            </LinearLayout>
+
+        </LinearLayout>
+        <Button
+            android:id="@+id/schedule_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginLeft="40dp"
+            android:layout_marginRight="40dp"
+            android:onClick="scheduleJob"
+            android:text="@string/schedule_job_button_text"/>
+        <Button
+            android:id="@+id/cancel_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="40dp"
+            android:layout_marginRight="40dp"
+            android:onClick="cancelAllJobs"
+            android:text="@string/cancel_all_jobs_button_text"/>
+    </LinearLayout>
+</ScrollView>
+<!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/layout/sample_main.xml -->
\ No newline at end of file

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values-v11/values.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values-v11/values.xml
new file mode 100644
index 0000000..006b56d
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values-v11/values.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values-v11/styles.xml -->
+    <eat-comment />
+
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
+        <!-- API 11 theme customizations can go here. -->
+    </style>
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values-v11/template-styles.xml -->
+    <eat-comment />
+
+    <style name="Theme.Base" parent="android:Theme.Holo.Light" />
+
+</resources>

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values-v14/values.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values-v14/values.xml
new file mode 100644
index 0000000..8a31793
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values-v14/values.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values-v14/styles.xml -->
+    <eat-comment />
+
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- API 14 theme customizations can go here. -->
+    </style>
+
+</resources>

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values-v21/values.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values-v21/values.xml
new file mode 100644
index 0000000..3dddacb
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values-v21/values.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values-v21/template-styles.xml -->
+    <eat-comment />
+
+    <style name="Theme.Base" parent="android:Theme.Material.Light" />
+
+</resources>

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values/values.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values/values.xml
new file mode 100644
index 0000000..8cc1cdd
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/intermediates/res/debug/values/values.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values/color.xml -->
+    <eat-comment />
+
+    <color name="none_received">#999999</color>
+    <color name="start_received">#00FF00</color>
+    <color name="stop_received">#FF0000</color>
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values/template-dimens.xml -->
+    <eat-comment />
+
+    <dimen name="horizontal_page_margin">@dimen/margin_medium</dimen>
+    <dimen name="margin_huge">64dp</dimen>
+    <dimen name="margin_large">32dp</dimen>
+    <dimen name="margin_medium">16dp</dimen>
+    <dimen name="margin_small">8dp</dimen>
+    <dimen name="margin_tiny">4dp</dimen>
+    <dimen name="vertical_page_margin">@dimen/margin_medium</dimen>
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values/strings.xml -->
+    <eat-comment />
+
+    <string name="any">Any</string>
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values/base-strings.xml -->
+    <eat-comment />
+
+    <string name="app_name">JobScheduler</string>
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values/strings.xml -->
+    <eat-comment />
+
+    <string name="cancel_all_jobs_button_text">Cancel all</string>
+    <string name="charging_caption">Charging:</string>
+    <string name="charging_text">Requires device plugged in.</string>
+    <string name="connectivity">Connectivity:</string>
+    <string name="constraints">Constraints</string>
+    <string name="deadline">Deadline:</string>
+    <string name="defaultparamtext">task params will show up here.</string>
+    <string name="delay">Delay:</string>
+    <string name="finish_job_button_text">taskFinished</string>
+    <string name="idle_caption">Idle:</string>
+    <string name="idle_mode_text">Requires device in idle mode.</string>
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values/base-strings.xml -->
+    <eat-comment />
+
+    <string name="intro_message">
+<![CDATA[
+        
+            
+            Demonstration of the JobScheduler API, which provides an interface for scheduling
+            background tasks when certain tasks apply.
+            
+        
+        ]]>
+    </string>
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values/strings.xml -->
+    <eat-comment />
+
+    <string name="onstarttask">onStartTask</string>
+    <string name="onstoptask">onStopTask</string>
+    <string name="schedule_job_button_text">Schedule Job</string>
+    <string name="timing">Timing:</string>
+    <string name="unmetered">WiFi</string>
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/main/res/values/styles.xml -->
+    <eat-comment />
+
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+    <!-- From: file:/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/src/template/res/values/template-styles.xml -->
+    <eat-comment />
+
+    <style name="AppTheme" parent="Theme.Sample" />
+
+    <style name="Theme.Base" parent="android:Theme.Light" />
+
+    <style name="Theme.Sample" parent="Theme.Base" />
+
+    <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/JobScheduler/JobSchedulerSample/build/outputs/apk/JobSchedulerSample-debug-unaligned.apk b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/outputs/apk/JobSchedulerSample-debug-unaligned.apk
new file mode 100644
index 0000000..1f54b15
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/outputs/apk/JobSchedulerSample-debug-unaligned.apk
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/outputs/apk/JobSchedulerSample-debug.apk b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/outputs/apk/JobSchedulerSample-debug.apk
new file mode 100644
index 0000000..9d2bbbd
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/build/outputs/apk/JobSchedulerSample-debug.apk
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/AndroidManifest.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..369bb57
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/AndroidManifest.xml

@@ -0,0 +1,48 @@
+<?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.jobscheduler" >
+
+    <uses-sdk
+        android:minSdkVersion="18"
+        android:targetSdkVersion="L" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:windowSoftInputMode="stateHidden" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name=".service.TestJobService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="true"/>
+    </application>
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/jobscheduler/MainActivity.java b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/jobscheduler/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/jobscheduler/MainActivity.java
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/jobscheduler/MainActivity.java

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/jobscheduler/service/TestJobService.java b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/jobscheduler/service/TestJobService.java
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/java/com/example/android/jobscheduler/service/TestJobService.java
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/java/com/example/android/jobscheduler/service/TestJobService.java

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/values-v11/styles.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values-v11/styles.xml

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/values-v14/styles.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values-v14/styles.xml

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/base-strings.xml
new file mode 100644
index 0000000..e209ce4
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/base-strings.xml

@@ -0,0 +1,32 @@
+<?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">JobScheduler</string>
+    <string name="intro_message">
+        <![CDATA[
+        
+            
+            Demonstration of the JobScheduler API, which provides an interface for scheduling
+            background tasks when certain tasks apply.
+            
+        
+        ]]>
+    </string>
+</resources>

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/values/color.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/color.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/values/color.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/color.xml

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/values/strings.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/values/styles.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/JobScheduler/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/JobScheduler/JobSchedulerSample/tests/AndroidManifest.xml b/prebuilts/gradle/JobScheduler/JobSchedulerSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..2a9d92d
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/JobSchedulerSample/tests/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?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
+
+  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.jobscheduler.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="L" />
+
+    <!-- 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.jobscheduler"
+            android:label="Tests for com.example.android.jobscheduler" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/JobScheduler/Application/tests/src/com/example/android/jobscheduler/tests/SampleTests.java b/prebuilts/gradle/JobScheduler/JobSchedulerSample/tests/src/com/example/android/jobscheduler/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/JobScheduler/Application/tests/src/com/example/android/jobscheduler/tests/SampleTests.java
rename to prebuilts/gradle/JobScheduler/JobSchedulerSample/tests/src/com/example/android/jobscheduler/tests/SampleTests.java

diff --git a/prebuilts/gradle/JobScheduler/LICENSE b/prebuilts/gradle/JobScheduler/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/JobScheduler/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/JobScheduler/README.md b/prebuilts/gradle/JobScheduler/README.md
deleted file mode 100644
index 6b285a9..0000000
--- a/prebuilts/gradle/JobScheduler/README.md
+++ /dev/null

@@ -1,50 +0,0 @@
-Android JobScheduler Sample
-==============================
-
-Demonstration of the JobScheduler API, which provides an interface for scheduling
-background tasks when certain tasks apply.
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-JobScheduler
-
-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/JobScheduler/README.txt b/prebuilts/gradle/JobScheduler/README.txt
index 015d2b3..9616c58 100644
--- a/prebuilts/gradle/JobScheduler/README.txt
+++ b/prebuilts/gradle/JobScheduler/README.txt

@@ -9,7 +9,7 @@
 Dependencies
 -------------
 
-- Android SDK Build-tools v20.0.0
+- Android SDK Build-tools v18.1
 - Android Support Repository v2
 
 Dependencies are available for download via the Android SDK Manager.

diff --git a/prebuilts/gradle/JobScheduler/build/intermediates/dex-cache/cache.xml b/prebuilts/gradle/JobScheduler/build/intermediates/dex-cache/cache.xml
new file mode 100644
index 0000000..a4ef1b6
--- /dev/null
+++ b/prebuilts/gradle/JobScheduler/build/intermediates/dex-cache/cache.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<pre-dex-items>
+
+    <item
+        dex="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/build/intermediates/pre-dexed/debug/support-v13-19.1.0-8bb550a1ea8426f24c63a6254eb56dc4611a86d8.jar"
+        jar="/opt/android-studio/sdk/extras/android/m2repository/com/android/support/support-v13/19.1.0/support-v13-19.1.0.jar"
+        jumboMode="false"
+        revision="19.1.0"
+        sha1="6b852a232f642c75a7fdfc7212b841b8c8f8959c"/>
+    <item
+        dex="/code/lmp-samples/developers/samples/android/background/JobScheduler/JobSchedulerSample/build/intermediates/pre-dexed/debug/support-v4-19.1.0-1bd09adae01d10f8f097a7c54535018843cfa550.jar"
+        jar="/opt/android-studio/sdk/extras/android/m2repository/com/android/support/support-v4/19.1.0/support-v4-19.1.0.jar"
+        jumboMode="false"
+        revision="19.1.0"
+        sha1="85f201b380937e61a9dce6ca90ccf6872abbfb67"/>
+
+</pre-dex-items>

diff --git a/prebuilts/gradle/JobScheduler/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/JobScheduler/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/JobScheduler/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/JobScheduler/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/JobScheduler/packaging.yaml b/prebuilts/gradle/JobScheduler/packaging.yaml
deleted file mode 100644
index f2ea281..0000000
--- a/prebuilts/gradle/JobScheduler/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:   [Background]
-languages:    [Java]
-solutions:    [Mobile]
-github:       googlesamples/android-JobScheduler
-level:        BEGINNER
-icon:         JobSchedulerSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2

diff --git a/prebuilts/gradle/JobScheduler/settings.gradle b/prebuilts/gradle/JobScheduler/settings.gradle
index 9464a35..77a2714 100644
--- a/prebuilts/gradle/JobScheduler/settings.gradle
+++ b/prebuilts/gradle/JobScheduler/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'JobSchedulerSample'

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/LNotifications/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 816d78f..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,39 +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.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.lnotifications"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name=".LNotificationActivity"
-            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/LNotifications/Application/src/main/java/com/example/android/lnotifications/HeadsUpNotificationFragment.java b/prebuilts/gradle/LNotifications/Application/src/main/java/com/example/android/lnotifications/HeadsUpNotificationFragment.java
deleted file mode 100644
index d304cf4..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/java/com/example/android/lnotifications/HeadsUpNotificationFragment.java
+++ /dev/null

@@ -1,134 +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.lnotifications;
-
-import android.app.Fragment;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.Toast;
-
-/**
- * Fragment that demonstrates options for displaying Heads-Up Notifications.
- */
-public class HeadsUpNotificationFragment extends Fragment {
-
-    /**
-     * NotificationId used for the notifications from this Fragment.
-     */
-    private static final int NOTIFICATION_ID = 1;
-
-    private NotificationManager mNotificationManager;
-
-    /**
-     * Button to show a notification.
-     */
-    private Button mShowNotificationButton;
-
-    /**
-     * If checked, notifications that this Fragment creates will be displayed as Heads-Up
-     * Notifications.
-     */
-    private CheckBox mUseHeadsUpCheckbox;
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @return A new instance of fragment NotificationFragment.
-     */
-    public static HeadsUpNotificationFragment newInstance() {
-        HeadsUpNotificationFragment fragment = new HeadsUpNotificationFragment();
-        fragment.setRetainInstance(true);
-        return fragment;
-    }
-
-    public HeadsUpNotificationFragment() {
-        // Required empty public constructor
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mNotificationManager = (NotificationManager) getActivity().getSystemService(Context
-                .NOTIFICATION_SERVICE);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_heads_up_notification, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        mShowNotificationButton = (Button) view.findViewById(R.id.show_notification_button);
-        mShowNotificationButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mNotificationManager.notify(NOTIFICATION_ID, createNotification(
-                        mUseHeadsUpCheckbox.isChecked()));
-                Toast.makeText(getActivity(), "Show Notification clicked", Toast.LENGTH_SHORT).show();
-            }
-        });
-        mUseHeadsUpCheckbox = (CheckBox) view.findViewById(R.id.use_heads_up_checkbox);
-    }
-
-    /**
-     * Creates a new notification depending on the argument.
-     *
-     * @param makeHeadsUpNotification A boolean value to indicating whether a notification will be
-     *                                created as a heads-up notification or not.
-     *                                <ul>
-     *                                <li>true : Creates a heads-up notification.</li>
-     *                                <li>false : Creates a non-heads-up notification.</li>
-     *                                </ul>
-     *
-     * @return A Notification instance.
-     */
-    //@VisibleForTesting
-    Notification createNotification(boolean makeHeadsUpNotification) {
-        Notification.Builder notificationBuilder = new Notification.Builder(getActivity())
-                .setSmallIcon(R.drawable.ic_launcher_notification)
-                .setPriority(Notification.PRIORITY_DEFAULT)
-                .setCategory(Notification.CATEGORY_MESSAGE)
-                .setContentTitle("Sample Notification")
-                .setContentText("This is a normal notification.");
-        if (makeHeadsUpNotification) {
-            Intent push = new Intent();
-            push.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            push.setClass(getActivity(), LNotificationActivity.class);
-
-            PendingIntent fullScreenPendingIntent = PendingIntent.getActivity(getActivity(), 0,
-                    push, PendingIntent.FLAG_CANCEL_CURRENT);
-            notificationBuilder
-                    .setContentText("Heads-Up Notification on Android L or above.")
-                    .setFullScreenIntent(fullScreenPendingIntent, true);
-        }
-        return notificationBuilder.build();
-    }
-}

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/java/com/example/android/lnotifications/LNotificationActivity.java b/prebuilts/gradle/LNotifications/Application/src/main/java/com/example/android/lnotifications/LNotificationActivity.java
deleted file mode 100644
index fbc3e62..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/java/com/example/android/lnotifications/LNotificationActivity.java
+++ /dev/null

@@ -1,80 +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.lnotifications;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.os.Bundle;
-
-/**
- * Launcher Activity for the L Notification samples application.
- */
-public class LNotificationActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_notification);
-        setTitle(R.string.title_lnotification_activity);
-        ActionBar actionBar = getActionBar();
-
-        // Use ViewPager in the support library where possible.
-        // At this time, the support library for L is not ready so using the deprecated method
-        // to create tabs.
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-        ActionBar.Tab tabHeadsUpNotification = actionBar.newTab().setText("Heads Up");
-        ActionBar.Tab tabVisibilityMetadata = actionBar.newTab().setText("Visibility");
-        ActionBar.Tab tabOtherMetadata = actionBar.newTab().setText("Others");
-        tabHeadsUpNotification.setTabListener(new FragmentTabListener(HeadsUpNotificationFragment
-                .newInstance()));
-        tabVisibilityMetadata.setTabListener(new FragmentTabListener(VisibilityMetadataFragment
-                .newInstance()));
-        tabOtherMetadata.setTabListener(new FragmentTabListener(OtherMetadataFragment.newInstance
-                ()));
-        actionBar.addTab(tabHeadsUpNotification, 0);
-        actionBar.addTab(tabVisibilityMetadata, 1);
-        actionBar.addTab(tabOtherMetadata, 2);
-    }
-
-    /**
-     * TabListener that replaces a Fragment when a tab is clicked.
-     */
-    private static class FragmentTabListener implements ActionBar.TabListener {
-        public Fragment fragment;
-
-        public FragmentTabListener(Fragment fragment) {
-            this.fragment = fragment;
-        }
-
-        @Override
-        public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
-            //do nothing.
-        }
-
-        @Override
-        public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
-            ft.replace(R.id.container, fragment);
-        }
-
-        @Override
-        public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
-            ft.remove(fragment);
-        }
-    }
-}

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/java/com/example/android/lnotifications/OtherMetadataFragment.java b/prebuilts/gradle/LNotifications/Application/src/main/java/com/example/android/lnotifications/OtherMetadataFragment.java
deleted file mode 100644
index 51616e7..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/java/com/example/android/lnotifications/OtherMetadataFragment.java
+++ /dev/null

@@ -1,345 +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.lnotifications;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.provider.MediaStore;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.Spinner;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import java.io.IOException;
-import java.util.Random;
-
-/**
- * Fragment that demonstrates how to attach metadata introduced in Android L, such as
- * priority data, notification category and person data.
- */
-public class OtherMetadataFragment extends Fragment {
-
-    private static final String TAG = OtherMetadataFragment.class.getSimpleName();
-
-    /**
-     * Request code used for picking a contact.
-     */
-    public static final int REQUEST_CODE_PICK_CONTACT = 1;
-
-    /**
-     * Incremental Integer used for ID for notifications so that each notification will be
-     * treated differently.
-     */
-    private Integer mIncrementalNotificationId = Integer.valueOf(0);
-
-    private NotificationManager mNotificationManager;
-
-    /**
-     * Button to show a notification.
-     */
-    private Button mShowNotificationButton;
-
-    /**
-     *  Spinner that holds possible categories used for a notification as
-     *  {@link Notification.Builder#setCategory(String)}.
-     */
-    private Spinner mCategorySpinner;
-
-    /**
-     * Spinner that holds possible priorities used for a notification as
-     * {@link Notification.Builder#setPriority(int)}.
-     */
-    private Spinner mPrioritySpinner;
-
-    /**
-     * Holds a URI for the person to be attached to the notification.
-     */
-    //@VisibleForTesting
-    Uri mContactUri;
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @return A new instance of fragment NotificationFragment.
-     */
-    public static OtherMetadataFragment newInstance() {
-        OtherMetadataFragment fragment = new OtherMetadataFragment();
-        fragment.setRetainInstance(true);
-        return fragment;
-    }
-
-    public OtherMetadataFragment() {
-        // Required empty public constructor
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mNotificationManager = (NotificationManager) getActivity().getSystemService(Context
-                .NOTIFICATION_SERVICE);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_other_metadata, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        mShowNotificationButton = (Button) view.findViewById(R.id.show_notification_button);
-        mShowNotificationButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Priority selectedPriority = (Priority) mPrioritySpinner.getSelectedItem();
-                Category selectedCategory = (Category) mCategorySpinner.getSelectedItem();
-                showNotificationClicked(selectedPriority, selectedCategory, mContactUri);
-            }
-        });
-
-        mCategorySpinner = (Spinner) view.findViewById(R.id.category_spinner);
-        ArrayAdapter<Category> categoryArrayAdapter = new ArrayAdapter<Category>(getActivity(),
-                android.R.layout.simple_spinner_item, Category.values());
-        categoryArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        mCategorySpinner.setAdapter(categoryArrayAdapter);
-
-        mPrioritySpinner = (Spinner) view.findViewById(R.id.priority_spinner);
-        ArrayAdapter<Priority> priorityArrayAdapter = new ArrayAdapter<Priority>(getActivity(),
-                android.R.layout.simple_spinner_item, Priority.values());
-        priorityArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        mPrioritySpinner.setAdapter(priorityArrayAdapter);
-
-        view.findViewById(R.id.attach_person).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                findContact();
-            }
-        });
-
-        view.findViewById(R.id.contact_entry).setVisibility(View.GONE);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        switch (requestCode) {
-            case REQUEST_CODE_PICK_CONTACT:
-                if (resultCode == Activity.RESULT_OK) {
-                    Uri contactUri = data.getData();
-                    mContactUri = contactUri;
-                    updateContactEntryFromUri(contactUri);
-                }
-                break;
-        }
-    }
-
-    /**
-     * Invoked when {@link #mShowNotificationButton} is clicked.
-     * Creates a new notification and sets metadata passed as arguments.
-     *
-     * @param priority   The priority metadata.
-     * @param category   The category metadata.
-     * @param contactUri The URI to be added to the new notification as metadata.
-     *
-     * @return A Notification instance.
-     */
-    //@VisibleForTesting
-    Notification createNotification(Priority priority, Category category, Uri contactUri) {
-        Notification.Builder notificationBuilder = new Notification.Builder(getActivity())
-                .setContentTitle("Notification with other metadata")
-                .setSmallIcon(R.drawable.ic_launcher_notification)
-                .setPriority(priority.value)
-                .setCategory(category.value)
-                .setContentText(String.format("Category %s, Priority %s", category.value,
-                        priority.name()));
-        if (contactUri != null) {
-            notificationBuilder.addPerson(contactUri.toString());
-            Bitmap photoBitmap = loadBitmapFromContactUri(contactUri);
-            if (photoBitmap != null) {
-                notificationBuilder.setLargeIcon(photoBitmap);
-            }
-        }
-        return notificationBuilder.build();
-    }
-
-    /**
-     * Invoked when {@link #mShowNotificationButton} is clicked.
-     * Creates a new notification and sets metadata passed as arguments.
-     *
-     * @param priority   The priority metadata.
-     * @param category   The category metadata.
-     * @param contactUri The URI to be added to the new notification as metadata.
-     */
-    private void showNotificationClicked(Priority priority, Category category, Uri contactUri) {
-        // Assigns a unique (incremented) notification ID in order to treat each notification as a
-        // different one. This helps demonstrate how a priority flag affects ordering.
-        mIncrementalNotificationId = new Integer(mIncrementalNotificationId + 1);
-        mNotificationManager.notify(mIncrementalNotificationId, createNotification(priority,
-                category, contactUri));
-        Toast.makeText(getActivity(), "Show Notification clicked", Toast.LENGTH_SHORT).show();
-    }
-
-    private void findContact() {
-        Intent intent = new Intent(Intent.ACTION_PICK, ContactsContract.Contacts.CONTENT_URI);
-        startActivityForResult(intent, REQUEST_CODE_PICK_CONTACT);
-    }
-
-    /**
-     * Returns a {@link Bitmap} from the Uri specified as the argument.
-     *
-     * @param contactUri The Uri from which the result Bitmap is created.
-     * @return The {@link Bitmap} instance retrieved from the contactUri.
-     */
-    private Bitmap loadBitmapFromContactUri(Uri contactUri) {
-        if (contactUri == null) {
-            return null;
-        }
-        Bitmap result = null;
-        Cursor cursor = getActivity().getContentResolver().query(contactUri, null, null, null,
-                null);
-        if (cursor != null && cursor.moveToFirst()) {
-            int idx = cursor.getColumnIndex(ContactsContract.Contacts.PHOTO_ID);
-            String hasPhoto = cursor.getString(idx);
-            Uri photoUri = Uri.withAppendedPath(contactUri, ContactsContract.Contacts.Photo
-                    .CONTENT_DIRECTORY);
-            if (hasPhoto != null) {
-                try {
-                    result = MediaStore.Images.Media.getBitmap(getActivity().getContentResolver()
-                            , photoUri);
-                } catch (IOException e) {
-                    Log.e(TAG, String.format("Failed to load resource. Uri %s", photoUri), e);
-                }
-            } else {
-                Drawable defaultContactDrawable = getActivity().getResources().getDrawable(R
-                        .drawable.ic_contact_picture);
-                result = ((BitmapDrawable) defaultContactDrawable).getBitmap();
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Updates the Contact information on the screen when a contact is picked.
-     *
-     * @param contactUri The Uri from which the contact is retrieved.
-     */
-    private void updateContactEntryFromUri(Uri contactUri) {
-        Cursor cursor = getActivity().getContentResolver().query(contactUri, null, null, null,
-                null);
-        if (cursor != null && cursor.moveToFirst()) {
-            int idx = cursor.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME);
-            String name = cursor.getString(idx);
-            idx = cursor.getColumnIndex(ContactsContract.Contacts.PHOTO_ID);
-            String hasPhoto = cursor.getString(idx);
-
-            Uri photoUri = Uri.withAppendedPath(contactUri, ContactsContract.Contacts.Photo
-                    .CONTENT_DIRECTORY);
-            ImageView contactPhoto = (ImageView) getActivity().findViewById(R.id.contact_photo);
-            if (hasPhoto != null) {
-                contactPhoto.setImageURI(photoUri);
-            } else {
-                Drawable defaultContactDrawable = getActivity().getResources().getDrawable(R
-                        .drawable.ic_contact_picture);
-                contactPhoto.setImageDrawable(defaultContactDrawable);
-            }
-            TextView contactName = (TextView) getActivity().findViewById(R.id.contact_name);
-            contactName.setText(name);
-
-            getActivity().findViewById(R.id.contact_entry).setVisibility(View.VISIBLE);
-            getActivity().findViewById(R.id.attach_person).setVisibility(View.GONE);
-            getActivity().findViewById(R.id.click_to_change).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    findContact();
-                }
-            });
-            Log.i(TAG, String.format("Contact updated. Name %s, PhotoUri %s", name, photoUri));
-        }
-    }
-
-    /**
-     * Enum indicating possible categories in {@link Notification} used from
-     * {@link #mCategorySpinner}.
-     */
-    //@VisibleForTesting
-    static enum Category {
-        ALARM("alarm"),
-        CALL("call"),
-        EMAIL("email"),
-        ERROR("err"),
-        EVENT("event"),
-        MESSAGE("msg"),
-        PROGRESS("progress"),
-        PROMO("promo"),
-        RECOMMENDATION("recommendation"),
-        SERVICE("service"),
-        SOCIAL("social"),
-        STATUS("status"),
-        SYSTEM("sys"),
-        TRANSPORT("transport");
-
-        private final String value;
-
-        Category(String value) {
-            this.value = value;
-        }
-
-        @Override
-        public String toString() {
-            return value;
-        }
-    }
-
-    /**
-     * Enum indicating possible priorities in {@link Notification} used from
-     * {@link #mPrioritySpinner}.
-     */
-    //@VisibleForTesting
-    static enum Priority {
-        DEFAULT(Notification.PRIORITY_DEFAULT),
-        MAX(Notification.PRIORITY_MAX),
-        HIGH(Notification.PRIORITY_HIGH),
-        LOW(Notification.PRIORITY_LOW),
-        MIN(Notification.PRIORITY_MIN);
-
-        private final int value;
-
-        Priority(int value) {
-            this.value = value;
-        }
-    }
-}

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/java/com/example/android/lnotifications/VisibilityMetadataFragment.java b/prebuilts/gradle/LNotifications/Application/src/main/java/com/example/android/lnotifications/VisibilityMetadataFragment.java
deleted file mode 100644
index 616632b..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/java/com/example/android/lnotifications/VisibilityMetadataFragment.java
+++ /dev/null

@@ -1,202 +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.lnotifications;
-
-import android.app.Fragment;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.RadioGroup;
-import android.widget.Toast;
-
-import java.util.Random;
-
-
-/**
- * Fragment that demonstrates how notifications with different visibility metadata differ on
- * a lockscreen.
- */
-public class VisibilityMetadataFragment extends Fragment {
-
-    private NotificationManager mNotificationManager;
-
-    /**
-     * {@link RadioGroup} that has Visibility RadioButton in its children.
-     */
-    private RadioGroup mRadioGroup;
-
-    /**
-     * Incremental Integer used for ID for notifications so that each notification will be
-     * treated differently.
-     */
-    private Integer mIncrementalNotificationId = Integer.valueOf(0);
-
-    /**
-     * Button to show a notification.
-     */
-    private Button mShowNotificationButton;
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @return A new instance of fragment NotificationFragment.
-     */
-    public static VisibilityMetadataFragment newInstance() {
-        VisibilityMetadataFragment fragment = new VisibilityMetadataFragment();
-        fragment.setRetainInstance(true);
-        return fragment;
-    }
-
-    public VisibilityMetadataFragment() {
-        // Required empty public constructor
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mNotificationManager = (NotificationManager) getActivity().getSystemService(Context
-                .NOTIFICATION_SERVICE);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_visibility_metadata_notification, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        mShowNotificationButton = (Button) view.findViewById(R.id.show_notification_button);
-        mShowNotificationButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                NotificationVisibility visibility = getVisibilityFromSelectedRadio(mRadioGroup);
-                showNotificationClicked(visibility);
-            }
-        });
-        mRadioGroup = (RadioGroup) view.findViewById(R.id.visibility_radio_group);
-    }
-
-    /**
-     * Creates a new notification with a different visibility level.
-     *
-     * @param visibility The visibility of the notification to be created.
-     *
-     * @return A Notification instance.
-     */
-    //@VisibleForTesting
-    Notification createNotification(NotificationVisibility visibility) {
-        Notification.Builder notificationBuilder = new Notification.Builder(getActivity())
-                .setContentTitle("Notification for Visibility metadata");
-
-        notificationBuilder.setVisibility(visibility.getVisibility());
-        notificationBuilder.setContentText(String.format("Visibility : %s",
-                visibility.getDescription()));
-        notificationBuilder.setSmallIcon(visibility.getNotificationIconId());
-
-        return notificationBuilder.build();
-    }
-
-    /**
-     * Returns a {@link NotificationVisibility} depending on which RadioButton in the radiogroup
-     * is selected.
-     *
-     * @param radiogroup The RadioGroup.
-     * @return The instance of {@link NotificationVisibility} corresponding to RadioButton.
-     */
-    private NotificationVisibility getVisibilityFromSelectedRadio(RadioGroup radiogroup) {
-        switch (radiogroup.getCheckedRadioButtonId()) {
-            case R.id.visibility_public_radio_button:
-                return NotificationVisibility.PUBLIC;
-            case R.id.visibility_private_radio_button:
-                return NotificationVisibility.PRIVATE;
-            case R.id.visibility_secret_radio_button:
-                return NotificationVisibility.SECRET;
-            default:
-                //If not selected, returns PUBLIC as default.
-                return NotificationVisibility.PUBLIC;
-        }
-    }
-
-    /**
-     * Invoked when {@link #mShowNotificationButton} is clicked.
-     * Creates a new notification with a different visibility level.
-     *
-     * @param visibility The visibility of the notification to be created.
-     */
-    private void showNotificationClicked(NotificationVisibility visibility) {
-        // Assigns a unique (incremented) notification ID in order to treat each notification as a
-        // different one. This helps demonstrate how a notification with a different visibility
-        // level differs on the lockscreen.
-        mIncrementalNotificationId = new Integer(mIncrementalNotificationId + 1);
-        mNotificationManager.notify(mIncrementalNotificationId, createNotification(visibility));
-        Toast.makeText(getActivity(), "Show Notification clicked", Toast.LENGTH_SHORT).show();
-    }
-
-    /**
-     * Enum indicating possible visibility levels for notifications and related data(String
-     * representation of visibility levels, an icon ID to create a notification) to
-     * create a notification.
-     */
-    //@VisibleForTesting
-    static enum NotificationVisibility {
-        PUBLIC(Notification.VISIBILITY_PUBLIC, "Public", R.drawable.ic_public_notification),
-        PRIVATE(Notification.VISIBILITY_PRIVATE, "Private", R.drawable.ic_private_notification),
-        SECRET(Notification.VISIBILITY_SECRET, "Secret", R.drawable.ic_secret_notification);
-
-        /**
-         * Visibility level of the notification.
-         */
-        private final int mVisibility;
-
-        /**
-         * String representation of the visibility.
-         */
-        private final String mDescription;
-
-        /**
-         * Id of an icon used for notifications created from the visibility.
-         */
-        private final int mNotificationIconId;
-
-        NotificationVisibility(int visibility, String description, int notificationIconId) {
-            mVisibility = visibility;
-            mDescription = description;
-            mNotificationIconId = notificationIconId;
-        }
-
-        public int getVisibility() {
-            return mVisibility;
-        }
-
-        public String getDescription() {
-            return mDescription;
-        }
-
-        public int getNotificationIconId() {
-            return mNotificationIconId;
-        }
-    }
-}

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_contact_picture.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_contact_picture.png
deleted file mode 100644
index 00d0ec4..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_contact_picture.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 015d248..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_launcher_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_launcher_notification.png
deleted file mode 100644
index 4b058c1..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_launcher_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_private.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_private.png
deleted file mode 100644
index 663f93e..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_private.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_private_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_private_notification.png
deleted file mode 100644
index dbf5139..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_private_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_public.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_public.png
deleted file mode 100644
index 033281d..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_public.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_public_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_public_notification.png
deleted file mode 100644
index fe1ee81..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_public_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_secret.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_secret.png
deleted file mode 100644
index a22dbdf..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_secret.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_secret_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_secret_notification.png
deleted file mode 100644
index 5776624..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/ic_secret_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_contact_picture.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_contact_picture.png
deleted file mode 100644
index 771cb6b..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_contact_picture.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 605a256..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_launcher_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_launcher_notification.png
deleted file mode 100644
index 72cd1b3..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_launcher_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_private.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_private.png
deleted file mode 100644
index 2556153..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_private.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_private_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_private_notification.png
deleted file mode 100644
index df93964..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_private_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_public.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_public.png
deleted file mode 100644
index ff0c653..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_public.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_public_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_public_notification.png
deleted file mode 100644
index 7c69019..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_public_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_secret.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_secret.png
deleted file mode 100644
index 2843164..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_secret.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_secret_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_secret_notification.png
deleted file mode 100644
index 652e8b0..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-mdpi/ic_secret_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_contact_picture.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_contact_picture.png
deleted file mode 100644
index bdba57b..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_contact_picture.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index c08bafa..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher_notification.png
deleted file mode 100644
index 9a42c7a..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_private.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_private.png
deleted file mode 100644
index 823d942..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_private.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_private_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_private_notification.png
deleted file mode 100644
index 497a1ac..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_private_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_public.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_public.png
deleted file mode 100644
index 93b89ff..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_public.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_public_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_public_notification.png
deleted file mode 100644
index 1d6f1f1..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_public_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_secret.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_secret.png
deleted file mode 100644
index 5124eee..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_secret.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_secret_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_secret_notification.png
deleted file mode 100644
index 8388dd5..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xhdpi/ic_secret_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_contact_picture.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_contact_picture.png
deleted file mode 100644
index b36ec17..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_contact_picture.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 1224b39..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher_notification.png
deleted file mode 100644
index e25fff1..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_private.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_private.png
deleted file mode 100644
index 4e4d3d6..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_private.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_private_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_private_notification.png
deleted file mode 100644
index dd5de27..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_private_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_public.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_public.png
deleted file mode 100644
index 6aede4e..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_public.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_public_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_public_notification.png
deleted file mode 100644
index 9b8c59f..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_public_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_secret.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_secret.png
deleted file mode 100644
index d1e126c..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_secret.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_secret_notification.png b/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_secret_notification.png
deleted file mode 100644
index be59c8f..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/drawable-xxhdpi/ic_secret_notification.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/LNotifications/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/LNotifications/Application/src/main/res/layout/activity_notification.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/layout/activity_notification.xml
deleted file mode 100644
index cd0cd68..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/layout/activity_notification.xml
+++ /dev/null

@@ -1,27 +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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    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="com.example.android.lnotifications.LNotificationActivity">
-</FrameLayout>

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/layout/contact_entry.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/layout/contact_entry.xml
deleted file mode 100644
index 90ab4b8..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/layout/contact_entry.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 xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/contact_photo"
-        android:layout_width="96dp"
-        android:layout_height="96dp"
-        android:src="@drawable/ic_contact_picture"
-        />
-
-    <TextView
-        android:id="@+id/contact_name"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_toRightOf="@id/contact_photo"
-        />
-
-    <TextView
-        android:id="@+id/click_to_change"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginLeft="10dp"
-        android:clickable="true"
-        android:layout_below="@id/contact_name"
-        android:layout_toRightOf="@id/contact_photo"
-        android:text="@string/click_to_change"
-        android:textColor="@color/link_text"
-        />
-</RelativeLayout>
\ No newline at end of file

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/layout/fragment_heads_up_notification.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/layout/fragment_heads_up_notification.xml
deleted file mode 100644
index bbcb84b..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/layout/fragment_heads_up_notification.xml
+++ /dev/null

@@ -1,45 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/heads_up_notification_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/heads_up_notification_description"
-        />
-
-    <CheckBox
-        android:id="@+id/use_heads_up_checkbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/heads_up_notification_description"
-        android:text="@string/use_heads_up_notification_where_possible"/>
-
-    <Button
-        android:id="@+id/show_notification_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginTop="20dp"
-        android:text="@string/show_notification"
-        />
-</LinearLayout>
\ No newline at end of file

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/layout/fragment_other_metadata.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/layout/fragment_other_metadata.xml
deleted file mode 100644
index 5222302..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/layout/fragment_other_metadata.xml
+++ /dev/null

@@ -1,107 +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
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
-
-    <LinearLayout android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:orientation="vertical">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/notification_metadata_description"
-            />
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_medium"
-            android:orientation="horizontal"
-            android:paddingLeft="@dimen/margin_tiny"
-            android:paddingRight="@dimen/margin_tiny"
-            >
-
-            <TextView
-                android:layout_width="70dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/label_category"
-                />
-            <Spinner
-                android:id="@+id/category_spinner"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_medium"
-            android:orientation="horizontal"
-            android:paddingLeft="@dimen/margin_tiny"
-            android:paddingRight="@dimen/margin_tiny"
-            >
-            <TextView
-                android:layout_width="70dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/label_priority"
-                />
-            <Spinner
-                android:id="@+id/priority_spinner"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/attach_person"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_medium"
-            android:clickable="true"
-            android:text="@string/attach_person"
-            android:textColor="@color/link_text"
-            android:paddingLeft="@dimen/margin_tiny"
-            android:paddingRight="@dimen/margin_tiny"
-            />
-
-        <include
-            layout="@layout/contact_entry"
-            android:id="@+id/contact_entry"
-            android:layout_marginTop="@dimen/margin_medium"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:paddingLeft="@dimen/margin_tiny"
-            android:paddingRight="@dimen/margin_tiny"
-            />
-
-        <Button
-            android:id="@+id/show_notification_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_medium"
-            android:text="@string/show_notification"
-            />
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/layout/fragment_visibility_metadata_notification.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/layout/fragment_visibility_metadata_notification.xml
deleted file mode 100644
index 2a7bbca..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/layout/fragment_visibility_metadata_notification.xml
+++ /dev/null

@@ -1,71 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/visibility_metadata_notification_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/visibility_metadata_description"
-        />
-
-    <RadioGroup
-        android:id="@+id/visibility_radio_group"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:checkedButton="@+id/visibility_public_radio_button"
-        android:layout_marginTop="20dp">
-
-        <RadioButton
-            android:id="@+id/visibility_public_radio_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_public"
-            android:text="@string/visibility_public"
-            />
-
-        <RadioButton
-            android:id="@+id/visibility_private_radio_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_private"
-            android:text="@string/visibility_private"
-            />
-
-        <RadioButton
-            android:id="@+id/visibility_secret_radio_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_secret"
-            android:text="@string/visibility_secret"
-            />
-
-    </RadioGroup>
-
-    <Button
-        android:id="@+id/show_notification_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginTop="20dp"
-        android:text="@string/show_notification"
-        />
-</LinearLayout>
\ No newline at end of file

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/LNotifications/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/LNotifications/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/LNotifications/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/LNotifications/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/values-v11/template-styles.xml
deleted file mode 100644
index 8c1ea66..0000000
--- a/prebuilts/gradle/LNotifications/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/LNotifications/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 417452d..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,30 +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">LNotifications Sample</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-                This sample demonstrates how new features for notifications introduced in Android L
-                are used such as Heads-Up notifications, visibility, people, category and priority
-                metadata. (Priority metadata has been present since Jelly Bean, but actually unused).
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/values/colors.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/values/colors.xml
deleted file mode 100644
index 31d81ee..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/values/colors.xml
+++ /dev/null

@@ -1,20 +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.
--->
-
-<resources>
-    <color name="black_overlay">#66000000</color>
-    <color name="link_text">#6DB7C4</color>
-</resources>

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/values/dimens.xml
deleted file mode 100644
index a776bac..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/values/dimens.xml
+++ /dev/null

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="navigation_drawer_width">240dp</dimen>
-
-</resources>

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/values/strings.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/values/strings.xml
deleted file mode 100644
index e6cb124..0000000
--- a/prebuilts/gradle/LNotifications/Application/src/main/res/values/strings.xml
+++ /dev/null

@@ -1,43 +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="action_settings">Settings</string>
-    <string name="heads_up_notification_description">This sample demonstrates options for displaying Heads-Up Notifications on Android.
-        \n\n
-    On Android L or above, you have options to display important information in front of the user (Heads-Up Notifications) which
-    does not obscure the entire viewport.\n</string>
-    <string name="notification_metadata_description">This sample demonstrates how to attach
-        metadata introduced in Android L, such as
-        priority data, notification category and person data.\n
-    </string>
-    <string name="visibility_metadata_description">
-        This sample demonstrates how to attach visibility metadata.\n
-        You need to have your lockscreen secured(PIN, Pattern, or Password) if you don\'t want to
-        show sensitive information on it.
-    </string>
-    <string name="visibility_public">Public</string>
-    <string name="visibility_private">Private</string>
-    <string name="visibility_secret">Secret</string>
-    <string name="title_lnotification_activity">Notification samples for L</string>
-    <string name="attach_person">Attach Person</string>
-    <string name="click_to_change">Click to Change</string>
-    <string name="show_notification">Show notification</string>
-    <string name="use_heads_up_notification_where_possible">Use Heads Up Notification when possible</string>
-    <string name="label_category">Category</string>
-    <string name="label_priority">Priority</string>
-</resources>

diff --git a/prebuilts/gradle/LNotifications/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/LNotifications/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/LNotifications/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/LNotifications/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 6e7d593..0000000
--- a/prebuilts/gradle/LNotifications/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/LNotifications/Application/tests/AndroidManifest.xml b/prebuilts/gradle/LNotifications/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 46a65af..0000000
--- a/prebuilts/gradle/LNotifications/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +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 name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest
-    package="com.example.android.lnotifications.tests"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    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:label="Tests for L notifications sample"
-        android:targetPackage="com.example.android.lnotifications"/>
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/HeadsUpNotificationFragmentTest.java b/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/HeadsUpNotificationFragmentTest.java
deleted file mode 100644
index 1264c16..0000000
--- a/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/HeadsUpNotificationFragmentTest.java
+++ /dev/null

@@ -1,51 +0,0 @@
-package com.example.android.lnotifications;
-
-import android.app.Notification;
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * Unit tests for {@link HeadsUpNotificationFragment}.
- */
-public class HeadsUpNotificationFragmentTest extends
-        ActivityInstrumentationTestCase2<LNotificationActivity> {
-
-    private LNotificationActivity mActivity;
-    private HeadsUpNotificationFragment mFragment;
-
-    public HeadsUpNotificationFragmentTest() {
-        super(LNotificationActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        // The first tab should be {@link HeadsUpNotificationFragment}, that is tested in the
-        // {@link LNotificationActivityTest}.
-        mActivity.getActionBar().setSelectedNavigationItem(0);
-        getInstrumentation().waitForIdleSync();
-        mFragment = (HeadsUpNotificationFragment) mActivity.getFragmentManager()
-                .findFragmentById(R.id.container);
-    }
-
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mFragment);
-        assertNotNull(mActivity.findViewById(R.id.heads_up_notification_description));
-        assertNotNull(mActivity.findViewById(R.id.show_notification_button));
-        assertNotNull(mActivity.findViewById(R.id.use_heads_up_checkbox));
-    }
-
-    public void testCreateNotification_verifyFullScreenIntentIsNotNull() {
-        Notification notification = mFragment.createNotification(true);
-        assertNotNull(notification.fullScreenIntent);
-    }
-
-    public void testCreateNotification_verifyFullScreenIntentIsNull() {
-        Notification notification = mFragment.createNotification(false);
-        assertNull(notification.fullScreenIntent);
-    }
-
-    // If Mockito can be used, mock the NotificationManager and tests Notifications are actually
-    // created.
-}

diff --git a/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/LNotificationActivityTest.java b/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/LNotificationActivityTest.java
deleted file mode 100644
index 061f9e8..0000000
--- a/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/LNotificationActivityTest.java
+++ /dev/null

@@ -1,49 +0,0 @@
-package com.example.android.lnotifications;
-
-import android.app.Fragment;
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * Unit tests for {@link LNotificationActivity}.
- */
-public class LNotificationActivityTest extends
-        ActivityInstrumentationTestCase2<LNotificationActivity> {
-
-    private LNotificationActivity mActivity;
-
-    public LNotificationActivityTest() {
-        super(LNotificationActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    public void testPreconditions() {
-        assertNotNull(String.format("%s is null", LNotificationActivity.class.getSimpleName()),
-                mActivity);
-    }
-
-    public void testFirstTabInActionBarIsHeadsUpNotificationFragment() {
-        mActivity.getActionBar().setSelectedNavigationItem(0);
-        getInstrumentation().waitForIdleSync();
-        Fragment fragment = mActivity.getFragmentManager().findFragmentById(R.id.container);
-        assertTrue(fragment instanceof HeadsUpNotificationFragment);
-    }
-
-    public void testSecondtabInActionBarIsVisibilityMetadataFragment() {
-        mActivity.getActionBar().setSelectedNavigationItem(1);
-        getInstrumentation().waitForIdleSync();
-        Fragment fragment = mActivity.getFragmentManager().findFragmentById(R.id.container);
-        assertTrue(fragment instanceof VisibilityMetadataFragment);
-    }
-
-    public void testThirdtabInActionBarIsOtherMetadataFragment() {
-        mActivity.getActionBar().setSelectedNavigationItem(2);
-        getInstrumentation().waitForIdleSync();
-        Fragment fragment = mActivity.getFragmentManager().findFragmentById(R.id.container);
-        assertTrue(fragment instanceof OtherMetadataFragment);
-    }
-}

diff --git a/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/OtherMetadataFragmentTest.java b/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/OtherMetadataFragmentTest.java
deleted file mode 100644
index 11a6c81..0000000
--- a/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/OtherMetadataFragmentTest.java
+++ /dev/null

@@ -1,84 +0,0 @@
-package com.example.android.lnotifications;
-
-import android.app.Activity;
-import android.app.Notification;
-import android.content.Intent;
-import android.net.Uri;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-
-/**
- * Unit tests for {@link OtherMetadataFragment}.
- */
-public class OtherMetadataFragmentTest extends
-        ActivityInstrumentationTestCase2<LNotificationActivity> {
-
-    private LNotificationActivity mActivity;
-    private OtherMetadataFragment mFragment;
-
-    public OtherMetadataFragmentTest() {
-        super(LNotificationActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        // The third tab should be {@link OtherMetadataFragment}, that is tested in the
-        // {@link LNotificationActivityTest}.
-        mActivity.getActionBar().setSelectedNavigationItem(2);
-        getInstrumentation().waitForIdleSync();
-        mFragment = (OtherMetadataFragment) mActivity.getFragmentManager()
-                .findFragmentById(R.id.container);
-    }
-
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mFragment);
-        assertNull(mFragment.mContactUri);
-        assertNotNull(mActivity.findViewById(R.id.attach_person));
-        assertNotNull(mActivity.findViewById(R.id.category_spinner));
-        assertNotNull(mActivity.findViewById(R.id.priority_spinner));
-        assertNotNull(mActivity.findViewById(R.id.show_notification_button));
-    }
-
-    public void testCreateNotification_verifyPriorityAndCategoryWithoutPerson() {
-        Notification notification = mFragment.createNotification(OtherMetadataFragment.Priority
-                .HIGH, OtherMetadataFragment.Category.CALL, null);
-        assertEquals(Notification.PRIORITY_HIGH, notification.priority);
-        assertEquals(Notification.CATEGORY_CALL, notification.category);
-    }
-
-    public void testCreateNotification_verifyPriorityAndCategoryWithPerson() {
-        String tel = "81 (90) 555-1212";
-        Uri dummyContactUri = Uri.fromParts("tel", tel, null);
-        Notification notification = mFragment.createNotification(OtherMetadataFragment.Priority
-                .DEFAULT, OtherMetadataFragment.Category.MESSAGE, dummyContactUri);
-        assertEquals(Notification.PRIORITY_DEFAULT, notification.priority);
-        assertEquals(Notification.CATEGORY_MESSAGE, notification.category);
-
-        String[] peopleArray = notification.extras.getStringArray(Notification.EXTRA_PEOPLE);
-        assertNotNull(peopleArray);
-        assertEquals(1, peopleArray.length);
-    }
-
-    public void testActionPickResultUpdatesContactInstanceField() {
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                String tel = "81 (90) 555-1212";
-                Uri dummyContactUri = Uri.fromParts("tel", tel, null);
-                Intent intent = new Intent(Intent.ACTION_PICK);
-                intent.setData(dummyContactUri);
-                mFragment.onActivityResult(mFragment.REQUEST_CODE_PICK_CONTACT,
-                        Activity.RESULT_OK, intent);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        assertNotNull(mFragment.mContactUri);
-    }
-}

diff --git a/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/VisibilityMetadataFragmentTest.java b/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/VisibilityMetadataFragmentTest.java
deleted file mode 100644
index eec62f0..0000000
--- a/prebuilts/gradle/LNotifications/Application/tests/src/com/example/android/lnotifications/VisibilityMetadataFragmentTest.java
+++ /dev/null

@@ -1,66 +0,0 @@
-package com.example.android.lnotifications;
-
-import android.app.Notification;
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * Unit tests for {@link VisibilityMetadataFragment}.
- */
-public class VisibilityMetadataFragmentTest extends
-        ActivityInstrumentationTestCase2<LNotificationActivity> {
-
-    private LNotificationActivity mActivity;
-    private VisibilityMetadataFragment mFragment;
-
-    public VisibilityMetadataFragmentTest() {
-        super(LNotificationActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        // The second tab should be {@link VisibilityMetadataFragment}, that is tested in the
-        // {@link LNotificationActivityTest}.
-        mActivity.getActionBar().setSelectedNavigationItem(1);
-        getInstrumentation().waitForIdleSync();
-        mFragment = (VisibilityMetadataFragment) mActivity.getFragmentManager()
-                .findFragmentById(R.id.container);
-    }
-
-    public void testPreconditions() {
-        assertNotNull(mActivity);
-        assertNotNull(mFragment);
-        assertNotNull(mActivity.findViewById(R.id.visibility_metadata_notification_description));
-        assertNotNull(mActivity.findViewById(R.id.visibility_radio_group));
-        assertNotNull(mActivity.findViewById(R.id.visibility_private_radio_button));
-        assertNotNull(mActivity.findViewById(R.id.visibility_secret_radio_button));
-        assertNotNull(mActivity.findViewById(R.id.visibility_public_radio_button));
-        assertNotNull(mActivity.findViewById(R.id.show_notification_button));
-    }
-
-    public void testCreateNotification_publicVisibility() {
-        Notification notification = mFragment.createNotification(VisibilityMetadataFragment
-                .NotificationVisibility.PUBLIC);
-
-        assertEquals(Notification.VISIBILITY_PUBLIC, notification.visibility);
-        assertEquals(R.drawable.ic_public_notification, notification.icon);
-    }
-
-    public void testCreateNotification_privateVisibility() {
-        Notification notification = mFragment.createNotification(VisibilityMetadataFragment
-                .NotificationVisibility.PRIVATE);
-
-        assertEquals(Notification.VISIBILITY_PRIVATE, notification.visibility);
-        assertEquals(R.drawable.ic_private_notification, notification.icon);
-    }
-
-    public void testCreateNotification_secretVisibility() {
-        Notification notification = mFragment.createNotification(VisibilityMetadataFragment
-                .NotificationVisibility.SECRET);
-
-        assertEquals(Notification.VISIBILITY_SECRET, notification.visibility);
-        assertEquals(R.drawable.ic_secret_notification, notification.icon);
-    }
-}
-

diff --git a/prebuilts/gradle/LNotifications/CONTRIB.md b/prebuilts/gradle/LNotifications/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/LNotifications/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/LNotifications/LICENSE b/prebuilts/gradle/LNotifications/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/LNotifications/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/LNotifications/README.md b/prebuilts/gradle/LNotifications/README.md
deleted file mode 100644
index 56f330b..0000000
--- a/prebuilts/gradle/LNotifications/README.md
+++ /dev/null

@@ -1,51 +0,0 @@
-Android RecyclerView Sample
-===========================
-
-This sample demonstrates how new features for notifications introduced in Android L
-are used such as Heads-Up notifications, visibility, people, category and priority
-metadata. (Priority metadata has been present since Jelly Bean, but actually unused).
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-BasicAndroidKeyStore
-
-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/LNotifications/build.gradle b/prebuilts/gradle/LNotifications/build.gradle
deleted file mode 100644
index 1dac6de..0000000
--- a/prebuilts/gradle/LNotifications/build.gradle
+++ /dev/null

@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-

diff --git a/prebuilts/gradle/LNotifications/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/LNotifications/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/gradle/LNotifications/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/LNotifications/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/LNotifications/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index fbe0ffd..0000000
--- a/prebuilts/gradle/LNotifications/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-#Wed Aug 06 17:33:35 JST 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip

diff --git a/prebuilts/gradle/LNotifications/gradlew b/prebuilts/gradle/LNotifications/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/LNotifications/gradlew
+++ /dev/null

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/prebuilts/gradle/LNotifications/gradlew.bat b/prebuilts/gradle/LNotifications/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/prebuilts/gradle/LNotifications/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/LNotifications/packaging.yaml b/prebuilts/gradle/LNotifications/packaging.yaml
deleted file mode 100644
index 23d65ba..0000000
--- a/prebuilts/gradle/LNotifications/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:   [UI]
-languages:    [Java]
-solutions:    [Mobile]
-github:       googlesamples/android-LNotifications
-level:        INTERMEDIATE
-icon:         LNotificationsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-doc_refs:
-    - android:preview/notifications.html
-license: apache2

diff --git a/prebuilts/gradle/LNotifications/settings.gradle b/prebuilts/gradle/LNotifications/settings.gradle
deleted file mode 100644
index 9464a35..0000000
--- a/prebuilts/gradle/LNotifications/settings.gradle
+++ /dev/null

@@ -1 +0,0 @@
-include 'Application'

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/MediaRecorder/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 539dc2c..0000000
--- a/prebuilts/gradle/MediaRecorder/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,54 +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.
--->
-
-
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.mediarecorder"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <!-- This app records A/V content from camera and stores it to disk -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.RECORD_VIDEO" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-feature android:name="android.hardware.camera" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme">
-        <!-- Since this sample records video from camera preview, locking the orientation to
-            landscape. Landscape mode offers us more preview space with standard video aspect
-            ratios (width > height) -->
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:screenOrientation="landscape">
-            <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/MediaRecorder/MediaRecorderSample/build.gradle b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/MediaRecorder/MediaRecorderSample/src/main/AndroidManifest.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..32f88f6
--- /dev/null
+++ b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/AndroidManifest.xml

@@ -0,0 +1,56 @@
+<?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.mediarecorder"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="17" />
+
+    <!-- This app records A/V content from camera and stores it to disk -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECORD_VIDEO" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-feature android:name="android.hardware.camera" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme">
+        <!-- Since this sample records video from camera preview, locking the orientation to
+            landscape. Landscape mode offers us more preview space with standard video aspect
+            ratios (width > height) -->
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="landscape">
+            <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/MediaRecorder/Application/src/main/java/com/example/android/common/media/CameraHelper.java b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/common/media/CameraHelper.java
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/java/com/example/android/common/media/CameraHelper.java
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/common/media/CameraHelper.java

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/java/com/example/android/common/media/MediaCodecWrapper.java
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/common/media/MediaCodecWrapper.java

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/java/com/example/android/mediarecorder/MainActivity.java b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/mediarecorder/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/java/com/example/android/mediarecorder/MainActivity.java
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/java/com/example/android/mediarecorder/MainActivity.java

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-sw720dp-land/dimens.xml

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/values/strings.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/MediaRecorder/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRecorder/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/MediaRecorder/MediaRecorderSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/MediaRecorder/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/MediaRecorder/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/MediaRecorder/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/MediaRecorder/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/MediaRecorder/settings.gradle b/prebuilts/gradle/MediaRecorder/settings.gradle
index 9464a35..61e4032 100644
--- a/prebuilts/gradle/MediaRecorder/settings.gradle
+++ b/prebuilts/gradle/MediaRecorder/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'MediaRecorderSample'

diff --git a/prebuilts/gradle/MediaRouter/Application/tests/AndroidManifest.xml b/prebuilts/gradle/MediaRouter/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 0f9258a..0000000
--- a/prebuilts/gradle/MediaRouter/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.mediarouter.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.mediarouter"
-            android:label="Tests for com.example.android.mediarouter" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle b/prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle
new file mode 100644
index 0000000..790578a
--- /dev/null
+++ b/prebuilts/gradle/MediaRouter/MediaRouterSample/build.gradle

@@ -0,0 +1,61 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+    compile "com.android.support:appcompat-v7:+"
+    compile "com.android.support:mediarouter-v7:+"
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/MediaRouter/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/LocalPlayer.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/MainActivity.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/MainActivity.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/MainActivity.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/OverlayDisplayWindow.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/Player.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/Player.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/Player.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/Player.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/PlaylistItem.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/RemotePlayer.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SampleMediaButtonReceiver.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SessionManager.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SessionManager.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/player/SessionManager.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/player/SessionManager.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProvider.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/java/com/example/android/mediarouter/provider/SampleMediaRouteProviderService.java

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_pause.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_pause.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_pause.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_play.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_play.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_play.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_stop.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_action_stop.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_action_stop.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_pause.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_pause.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_pause.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_play.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_play.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_play.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_stop.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_media_stop.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_media_stop.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_add.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_add.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_add.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_add.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_delete.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_delete.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/ic_menu_delete.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/ic_menu_delete.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_pause.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_pause.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_pause.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_play.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_play.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_play.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_stop.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_action_stop.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_action_stop.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_pause.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_pause.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_pause.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_play.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_play.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_play.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_stop.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_media_stop.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_media_stop.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_add.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_add.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_add.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_add.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_delete.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_delete.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-mdpi/ic_menu_delete.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-mdpi/ic_menu_delete.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_pause.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_pause.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_pause.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_play.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_play.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_play.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_stop.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_action_stop.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_action_stop.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_pause.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_pause.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_pause.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_pause.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_play.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_play.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_play.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_play.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_stop.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_stop.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_action_stop.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_action_stop.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_add.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_add.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_add.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_add.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable-xxhdpi/ic_suggestions_delete.png
Binary files differ

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/drawable/list_background.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable/list_background.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/drawable/list_background.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/drawable/list_background.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/layout-land/grid_layout_2.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout-land/grid_layout_2.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/layout-land/grid_layout_2.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout-land/grid_layout_2.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/layout/media_item.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/media_item.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/layout/media_item.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/media_item.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/layout/overlay_display_window.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/overlay_display_window.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/layout/overlay_display_window.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/overlay_display_window.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/layout/sample_media_router.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/layout/sample_media_router.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/layout/sample_media_router_presentation.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router_presentation.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/layout/sample_media_router_presentation.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/layout/sample_media_router_presentation.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/menu/sample_media_router_menu.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/menu/sample_media_router_menu.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/menu/sample_media_router_menu.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/menu/sample_media_router_menu.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/values/arrays.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/arrays.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/values/arrays.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/arrays.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/values/colors.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/values/colors.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/colors.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/values/strings.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/MediaRouter/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/MediaRouter/MediaRouterSample/tests/AndroidManifest.xml b/prebuilts/gradle/MediaRouter/MediaRouterSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..f60a1d7
--- /dev/null
+++ b/prebuilts/gradle/MediaRouter/MediaRouterSample/tests/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?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
+
+  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.mediarouter.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.mediarouter"
+            android:label="Tests for com.example.android.mediarouter" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/MediaRouter/Application/tests/src/com/example/android/mediarouter/tests/SampleTests.java b/prebuilts/gradle/MediaRouter/MediaRouterSample/tests/src/com/example/android/mediarouter/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/MediaRouter/Application/tests/src/com/example/android/mediarouter/tests/SampleTests.java
rename to prebuilts/gradle/MediaRouter/MediaRouterSample/tests/src/com/example/android/mediarouter/tests/SampleTests.java

diff --git a/prebuilts/gradle/MediaRouter/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/MediaRouter/gradle/wrapper/gradle-wrapper.properties
index 1e61d1f..5de946b 100644
--- a/prebuilts/gradle/MediaRouter/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/MediaRouter/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip

diff --git a/prebuilts/gradle/MediaRouter/settings.gradle b/prebuilts/gradle/MediaRouter/settings.gradle
index 9464a35..fff93ae 100644
--- a/prebuilts/gradle/MediaRouter/settings.gradle
+++ b/prebuilts/gradle/MediaRouter/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'MediaRouterSample'

diff --git a/prebuilts/gradle/NavigationDrawer/Application/build.gradle b/prebuilts/gradle/NavigationDrawer/Application/build.gradle
deleted file mode 100644
index 92594e8..0000000
--- a/prebuilts/gradle/NavigationDrawer/Application/build.gradle
+++ /dev/null

@@ -1,71 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
-    }
-}
-
-apply plugin: 'com.android.application'
-
-repositories {
-    jcenter()
-}
-
-
-dependencies {
-
-
-    compile "com.android.support:support-v13:20.+"
-    compile "com.android.support:appcompat-v7:20.+"
-    compile "com.android.support:recyclerview-v7:+"
-    compile "com.android.support:cardview-v7:21.+"
-}
-
-// 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.0.0"
-
-    defaultConfig {
-        minSdkVersion 14
-        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/NavigationDrawer/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/NavigationDrawer/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index ab2e141..0000000
--- a/prebuilts/gradle/NavigationDrawer/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,44 +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.navigationdrawer"
-    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=".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>
-        <activity
-            android:name=".NavigationDrawerActivity"
-            android:label="@string/app_name" >
-        </activity>
-    </application>
-
-</manifest>

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/navigationdrawer/MainActivity.java b/prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/navigationdrawer/MainActivity.java
deleted file mode 100644
index 665edf3..0000000
--- a/prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/navigationdrawer/MainActivity.java
+++ /dev/null

@@ -1,107 +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.navigationdrawer;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.GridView;
-import android.widget.TextView;
-
-/**
- * A simple launcher activity offering access to the individual samples in this project.
- */
-public class MainActivity extends Activity implements AdapterView.OnItemClickListener {
-    private Sample[] mSamples;
-    private GridView mGridView;
-
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        // Prepare list of samples in this dashboard.
-        mSamples = new Sample[]{
-            new Sample(R.string.navigationdraweractivity_title, R.string.navigationdraweractivity_description,
-                    NavigationDrawerActivity.class),
-        };
-
-        // Prepare the GridView
-        mGridView = (GridView) findViewById(android.R.id.list);
-        mGridView.setAdapter(new SampleAdapter());
-        mGridView.setOnItemClickListener(this);
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> container, View view, int position, long id) {
-        startActivity(mSamples[position].intent);
-    }
-
-    private class SampleAdapter extends BaseAdapter {
-        @Override
-        public int getCount() {
-            return mSamples.length;
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mSamples[position];
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return mSamples[position].hashCode();
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup container) {
-            if (convertView == null) {
-                convertView = getLayoutInflater().inflate(R.layout.sample_dashboard_item,
-                        container, false);
-            }
-
-            ((TextView) convertView.findViewById(android.R.id.text1)).setText(
-                    mSamples[position].titleResId);
-            ((TextView) convertView.findViewById(android.R.id.text2)).setText(
-                    mSamples[position].descriptionResId);
-            return convertView;
-        }
-    }
-
-    private class Sample {
-        int titleResId;
-        int descriptionResId;
-        Intent intent;
-
-        private Sample(int titleResId, int descriptionResId, Intent intent) {
-            this.intent = intent;
-            this.titleResId = titleResId;
-            this.descriptionResId = descriptionResId;
-        }
-
-        private Sample(int titleResId, int descriptionResId,
-                Class<? extends Activity> activityClass) {
-            this(titleResId, descriptionResId,
-                    new Intent(MainActivity.this, activityClass));
-        }
-    }
-}

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/layout/sample_dashboard_item.xml b/prebuilts/gradle/NavigationDrawer/Application/src/main/res/layout/sample_dashboard_item.xml
deleted file mode 100644
index 516d289..0000000
--- a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/layout/sample_dashboard_item.xml
+++ /dev/null

@@ -1,50 +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.
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <!-- The CardView needs to be wrapped to ensure spacing is applied correctly. -->
-
-    <android.support.v7.widget.CardView
-        style="@style/Widget.SampleDashboard.Card"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            style="@style/Widget.SampleDashboard.Item"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@android:id/text1"
-                style="@style/Widget.SampleDashboard.Item.Title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Hello world" />
-
-            <TextView
-                android:id="@android:id/text2"
-                style="@style/Widget.SampleDashboard.Item.Description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        </LinearLayout>
-
-    </android.support.v7.widget.CardView>
-
-</FrameLayout>

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/activitycards-colors.xml b/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/activitycards-colors.xml
deleted file mode 100644
index 79605c7..0000000
--- a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/activitycards-colors.xml
+++ /dev/null

@@ -1,21 +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.
-  -->
-
-<resources>
-    <color name="teal">#009688</color>
-    <color name="black_87">#DD000000</color>
-    <color name="black_54">#89000000</color>
-</resources>

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/activitycards-dimens.xml b/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/activitycards-dimens.xml
deleted file mode 100644
index 714cb00..0000000
--- a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/activitycards-dimens.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>
-
-    <dimen name="card_padding">16dp</dimen>
-    <dimen name="card_margin">8dp</dimen>
-    
-</resources>
\ No newline at end of file

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/activitycards-strings.xml b/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/activitycards-strings.xml
deleted file mode 100644
index 885a1ec..0000000
--- a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/activitycards-strings.xml
+++ /dev/null

@@ -1,22 +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="navigationdraweractivity_title">Navigation Drawer Example</string>
-    <string name="navigationdraweractivity_description">This example illustrates a common usage of the DrawerLayout widget in the Android
-            support library.</string>
-</resources>

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 62e8426..0000000
--- a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,29 +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">Navigation Drawer</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-             This example illustrates a common usage of the DrawerLayout widget in the Android
-             support library.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 374dc51..0000000
--- a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/template-styles.xml
+++ /dev/null

@@ -1,76 +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" />
-
-    <style name="Theme.Sample" parent="Theme.Base" />
-
-    <style name="AppTheme" parent="Theme.Sample" />
-    <!-- Widget styling -->
-
-    <style name="Widget" />
-
-    <style name="Widget.SampleContentContainer">
-        <item name="android:paddingTop">@dimen/vertical_page_margin</item>
-        <item name="android:paddingBottom">@dimen/vertical_page_margin</item>
-        <item name="android:paddingLeft">@dimen/horizontal_page_margin</item>
-        <item name="android:paddingRight">@dimen/horizontal_page_margin</item>
-    </style>
-
-<style name="Widget.SampleMessage">
-        <item name="android:textAppearance">?android:textAppearanceMedium</item>
-        <item name="android:lineSpacingMultiplier">1.1</item>
-        <item name="android:textColor">@color/black_54</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Grid" parent="Widget">
-        <item name="android:stretchMode">columnWidth</item>
-        <item name="android:columnWidth">200dp</item>
-        <item name="android:numColumns">auto_fit</item>
-        <item name="android:drawSelectorOnTop">true</item>
-        <item name="android:horizontalSpacing">0dp</item>
-        <item name="android:verticalSpacing">0dp</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Card" parent="Widget">
-        <item name="android:gravity">center</item>
-        <item name="android:layout_margin">@dimen/card_margin</item>
-        <item name="cardCornerRadius">4dp</item>
-        <item name="cardElevation">5dp</item>
-        <item name="contentPadding">@dimen/card_padding</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Item" parent="Widget">
-    </style>
-
-    <style name="Widget.SampleDashboard.Item.Title" parent="Widget">
-        <item name="android:layout_marginBottom">@dimen/margin_tiny</item>
-        <item name="android:textAppearance">?android:textAppearanceLarge</item>
-        <item name="android:textColor">@color/teal</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textSize">24sp</item>
-    </style>
-
-    <style name="Widget.SampleDashboard.Item.Description" parent="Widget">
-        <item name="android:textAppearance">?android:textAppearanceSmall</item>
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:textColor">@color/black_87</item>
-    </style>
-</resources>

diff --git a/prebuilts/gradle/NavigationDrawer/Application/tests/AndroidManifest.xml b/prebuilts/gradle/NavigationDrawer/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 6a651a5..0000000
--- a/prebuilts/gradle/NavigationDrawer/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.navigationdrawer.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.navigationdrawer"
-            android:label="Tests for com.example.android.navigationdrawer" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/NavigationDrawer/CONTRIB.md b/prebuilts/gradle/NavigationDrawer/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/NavigationDrawer/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/NavigationDrawer/LICENSE b/prebuilts/gradle/NavigationDrawer/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/NavigationDrawer/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/NavigationDrawer/NavigationDrawerSample/build.gradle b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/build.gradle
new file mode 100644
index 0000000..176482c
--- /dev/null
+++ b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/build.gradle

@@ -0,0 +1,69 @@
+
+
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+repositories {
+    jcenter()
+}
+
+
+dependencies {
+
+
+    compile "com.android.support:support-v13:20.+"
+    compile "com.android.support:appcompat-v7:20.+"
+    compile "com.android.support:recyclerview-v7:+"
+    compile "com.android.support:cardview-v7:21.+"
+}
+
+// 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 "android-L"
+
+    buildToolsVersion "19.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/NavigationDrawer/NavigationDrawerSample/src/main/AndroidManifest.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..1a9931f
--- /dev/null
+++ b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/AndroidManifest.xml

@@ -0,0 +1,46 @@
+<?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.navigationdrawer"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="19" />
+
+    <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>
+        <activity
+            android:name=".NavigationDrawerActivity"
+            android:label="@string/app_name" >
+        </activity>
+    </application>
+
+</manifest>

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/navigationdrawer/MainActivity.java b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/navigationdrawer/MainActivity.java
new file mode 100644
index 0000000..a5cb890
--- /dev/null
+++ b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/navigationdrawer/MainActivity.java

@@ -0,0 +1,110 @@
+/*
+* 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.navigationdrawer;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.GridView;
+import android.widget.TextView;
+
+/**
+ * A simple launcher activity offering access to the individual samples in this project.
+ */
+public class MainActivity extends Activity implements AdapterView.OnItemClickListener {
+    private Sample[] mSamples;
+    private GridView mGridView;
+
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        // Prepare list of samples in this dashboard.
+        mSamples = new Sample[]{
+            new Sample(R.string.navigationdraweractivity_title, R.string.navigationdraweractivity_description,
+                    NavigationDrawerActivity.class),
+        };
+
+        // Prepare the GridView
+        mGridView = (GridView) findViewById(android.R.id.list);
+        mGridView.setAdapter(new SampleAdapter());
+        mGridView.setOnItemClickListener(this);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> container, View view, int position, long id) {
+        startActivity(mSamples[position].intent);
+    }
+
+    private class SampleAdapter extends BaseAdapter {
+        @Override
+        public int getCount() {
+            return mSamples.length;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mSamples[position];
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return mSamples[position].hashCode();
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup container) {
+            if (convertView == null) {
+                convertView = getLayoutInflater().inflate(R.layout.sample_dashboard_item,
+                        container, false);
+            }
+
+            ((TextView) convertView.findViewById(android.R.id.text1)).setText(
+                    mSamples[position].titleResId);
+            ((TextView) convertView.findViewById(android.R.id.text2)).setText(
+                    mSamples[position].descriptionResId);
+            return convertView;
+        }
+    }
+
+    private class Sample {
+        int titleResId;
+        int descriptionResId;
+        Intent intent;
+
+        private Sample(int titleResId, int descriptionResId, Intent intent) {
+            this.intent = intent;
+            this.titleResId = titleResId;
+            this.descriptionResId = descriptionResId;
+        }
+
+        private Sample(int titleResId, int descriptionResId,
+                Class<? extends Activity> activityClass) {
+            this(titleResId, descriptionResId,
+                    new Intent(MainActivity.this, activityClass));
+        }
+    }
+}

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/navigationdrawer/NavigationDrawerActivity.java b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/navigationdrawer/NavigationDrawerActivity.java
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/navigationdrawer/NavigationDrawerActivity.java
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/navigationdrawer/NavigationDrawerActivity.java

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/navigationdrawer/PlanetAdapter.java b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/navigationdrawer/PlanetAdapter.java
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/java/com/example/android/navigationdrawer/PlanetAdapter.java
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/java/com/example/android/navigationdrawer/PlanetAdapter.java

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-hdpi/action_search.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/action_search.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-hdpi/action_search.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/action_search.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-hdpi/drawer_shadow.9.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/drawer_shadow.9.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-hdpi/drawer_shadow.9.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/drawer_shadow.9.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-hdpi/ic_drawer.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/ic_drawer.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-hdpi/ic_drawer.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/ic_drawer.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-mdpi/action_search.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/action_search.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-mdpi/action_search.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/action_search.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-mdpi/drawer_shadow.9.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/drawer_shadow.9.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-mdpi/drawer_shadow.9.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/drawer_shadow.9.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-mdpi/ic_drawer.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/ic_drawer.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-mdpi/ic_drawer.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/ic_drawer.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-xhdpi/action_search.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/action_search.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-xhdpi/action_search.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/action_search.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/drawer_shadow.9.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-xhdpi/drawer_shadow.9.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/drawer_shadow.9.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-xhdpi/ic_drawer.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/ic_drawer.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-xhdpi/ic_drawer.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/ic_drawer.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/earth.jpg b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/earth.jpg
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/earth.jpg
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/earth.jpg
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/jupiter.jpg b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/jupiter.jpg
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/jupiter.jpg
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/jupiter.jpg
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/mars.jpg b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/mars.jpg
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/mars.jpg
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/mars.jpg
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/mercury.jpg b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/mercury.jpg
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/mercury.jpg
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/mercury.jpg
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/neptune.jpg b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/neptune.jpg
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/neptune.jpg
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/neptune.jpg
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/saturn.jpg b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/saturn.jpg
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/saturn.jpg
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/saturn.jpg
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/uranus.jpg b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/uranus.jpg
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/uranus.jpg
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/uranus.jpg
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/venus.jpg b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/venus.jpg
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/drawable/venus.jpg
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/drawable/venus.jpg
Binary files differ

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/layout/activity_navigation_drawer.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/activity_navigation_drawer.xml
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/layout/activity_navigation_drawer.xml
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/activity_navigation_drawer.xml

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/layout/drawer_list_item.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/drawer_list_item.xml
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/layout/drawer_list_item.xml
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/drawer_list_item.xml

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/layout/fragment_planet.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/fragment_planet.xml
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/layout/fragment_planet.xml
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/fragment_planet.xml

diff --git a/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/sample_dashboard_item.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/sample_dashboard_item.xml
new file mode 100644
index 0000000..38987ee
--- /dev/null
+++ b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/layout/sample_dashboard_item.xml

@@ -0,0 +1,32 @@
+<!--
+  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"
+    style="@style/Widget.SampleDashboard.Item"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView android:id="@android:id/text1"
+        style="@style/Widget.SampleDashboard.Item.Title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView android:id="@android:id/text2"
+        style="@style/Widget.SampleDashboard.Item.Description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/menu/navigation_drawer.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/menu/navigation_drawer.xml
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/menu/navigation_drawer.xml
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/menu/navigation_drawer.xml

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values-v20/styles.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values-v20/styles.xml
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/values-v20/styles.xml
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values-v20/styles.xml

diff --git a/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/activitycards-strings.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/activitycards-strings.xml
new file mode 100644
index 0000000..6906a66
--- /dev/null
+++ b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/activitycards-strings.xml

@@ -0,0 +1,25 @@
+<?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="navigationdraweractivity_title">Navigation Drawer Example</string>
+    <string name="navigationdraweractivity_description">This example illustrates a common usage of the DrawerLayout widget in the Android
+            support library.</string>
+</resources>

diff --git a/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/base-strings.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/base-strings.xml
new file mode 100644
index 0000000..148f4ae
--- /dev/null
+++ b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/base-strings.xml

@@ -0,0 +1,32 @@
+<?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">Navigation Drawer</string>
+    <string name="intro_message">
+        <![CDATA[
+        
+            
+             This example illustrates a common usage of the DrawerLayout widget in the Android
+             support library.
+            
+        
+        ]]>
+    </string>
+</resources>

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/strings.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/template-styles.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/template-styles.xml
new file mode 100644
index 0000000..cafe531
--- /dev/null
+++ b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/src/main/res/values/template-styles.xml

@@ -0,0 +1,71 @@
+<!--
+  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" />
+
+    <style name="Theme.Sample" parent="Theme.Base" />
+
+    <style name="AppTheme" parent="Theme.Sample" />
+    <!-- Widget styling -->
+
+    <style name="Widget" />
+
+    <style name="Widget.SampleContentContainer">
+        <item name="android:paddingTop">@dimen/vertical_page_margin</item>
+        <item name="android:paddingBottom">@dimen/vertical_page_margin</item>
+        <item name="android:paddingLeft">@dimen/horizontal_page_margin</item>
+        <item name="android:paddingRight">@dimen/horizontal_page_margin</item>
+    </style>
+
+    <style name="Widget.SampleMessage">
+        <item name="android:textAppearance">?android:textAppearanceMedium</item>
+        <item name="android:lineSpacingMultiplier">1.1</item>
+    </style>
+
+    <style name="Widget.SampleDashboard.Grid" parent="Widget">
+        <item name="android:stretchMode">columnWidth</item>
+        <item name="android:columnWidth">200dp</item>
+        <item name="android:numColumns">auto_fit</item>
+        <item name="android:drawSelectorOnTop">true</item>
+        <item name="android:horizontalSpacing">@dimen/margin_medium</item>
+        <item name="android:verticalSpacing">@dimen/margin_medium</item>
+    </style>
+
+    <style name="Widget.SampleDashboard.Item" parent="Widget">
+        <item name="android:background">@drawable/sample_dashboard_item_background</item>
+        <item name="android:paddingTop">@dimen/margin_small</item>
+        <item name="android:paddingLeft">@dimen/margin_medium</item>
+        <item name="android:paddingRight">@dimen/margin_medium</item>
+        <item name="android:paddingBottom">@dimen/margin_medium</item>
+    </style>
+
+    <style name="Widget.SampleDashboard.Item.Title" parent="Widget">
+        <item name="android:layout_marginBottom">@dimen/margin_tiny</item>
+        <item name="android:textAppearance">?android:textAppearanceLarge</item>
+        <item name="android:textColor">#09c</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">24sp</item>
+    </style>
+
+    <style name="Widget.SampleDashboard.Item.Description" parent="Widget">
+        <item name="android:textAppearance">?android:textAppearanceSmall</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+    </style>
+</resources>

diff --git a/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/tests/AndroidManifest.xml b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..62ab13a
--- /dev/null
+++ b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/tests/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?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
+
+  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.navigationdrawer.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.navigationdrawer"
+            android:label="Tests for com.example.android.navigationdrawer" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/NavigationDrawer/Application/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java b/prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/NavigationDrawer/Application/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java
rename to prebuilts/gradle/NavigationDrawer/NavigationDrawerSample/tests/src/com/example/android/navigationdrawer/tests/SampleTests.java

diff --git a/prebuilts/gradle/NavigationDrawer/README.md b/prebuilts/gradle/NavigationDrawer/README.md
deleted file mode 100644
index 26fb4d9..0000000
--- a/prebuilts/gradle/NavigationDrawer/README.md
+++ /dev/null

@@ -1,50 +0,0 @@
-Android Navigation Drawer Sample
-==============================
-
-This example illustrates a common usage of the DrawerLayout widget in the Android
-support library.
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-Navigation Drawer
-
-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/NavigationDrawer/README.txt b/prebuilts/gradle/NavigationDrawer/README.txt
new file mode 100644
index 0000000..9616c58
--- /dev/null
+++ b/prebuilts/gradle/NavigationDrawer/README.txt

@@ -0,0 +1,18 @@
+Build Instructions
+-------------------
+
+This sample uses the Gradle build system. To build this project, use the
+"gradlew build" command or use "Import Project" in Android Studio.
+
+To see a list of all available commands, run "gradlew tasks".
+
+Dependencies
+-------------
+
+- Android SDK Build-tools v18.1
+- Android Support Repository v2
+
+Dependencies are available for download via the Android SDK Manager.
+
+Android Studio is available for download at:
+    http://developer.android.com/sdk/installing/studio.html

diff --git a/prebuilts/gradle/NavigationDrawer/packaging.yaml b/prebuilts/gradle/NavigationDrawer/packaging.yaml
deleted file mode 100644
index f66fb11..0000000
--- a/prebuilts/gradle/NavigationDrawer/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-Navigation Drawer
-level:        BEGINNER
-icon:         Navigation DrawerSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-license:      apache2

diff --git a/prebuilts/gradle/NavigationDrawer/settings.gradle b/prebuilts/gradle/NavigationDrawer/settings.gradle
index 9464a35..feade60 100644
--- a/prebuilts/gradle/NavigationDrawer/settings.gradle
+++ b/prebuilts/gradle/NavigationDrawer/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'NavigationDrawerSample'

diff --git a/prebuilts/gradle/NetworkConnect/Application/tests/AndroidManifest.xml b/prebuilts/gradle/NetworkConnect/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 2aaee3f..0000000
--- a/prebuilts/gradle/NetworkConnect/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.networkconnect.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.networkconnect"
-            android:label="Tests for com.example.android.networkconnect" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/build.gradle b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/NetworkConnect/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/MainActivity.java b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/MainActivity.java
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/MainActivity.java

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/java/com/example/android/networkconnect/SimpleTextFragment.java

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/menu/main.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/values/strings.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/NetworkConnect/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/NetworkConnect/NetworkConnectSample/tests/AndroidManifest.xml b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..80fec80
--- /dev/null
+++ b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.networkconnect.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.networkconnect"
+            android:label="Tests for com.example.android.networkconnect" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/NetworkConnect/Application/tests/src/com/example/android/networkconnect/tests/SampleTests.java b/prebuilts/gradle/NetworkConnect/NetworkConnectSample/tests/src/com/example/android/networkconnect/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/NetworkConnect/Application/tests/src/com/example/android/networkconnect/tests/SampleTests.java
rename to prebuilts/gradle/NetworkConnect/NetworkConnectSample/tests/src/com/example/android/networkconnect/tests/SampleTests.java

diff --git a/prebuilts/gradle/NetworkConnect/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/NetworkConnect/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/NetworkConnect/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/NetworkConnect/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/NetworkConnect/settings.gradle b/prebuilts/gradle/NetworkConnect/settings.gradle
index 9464a35..ebae091 100644
--- a/prebuilts/gradle/NetworkConnect/settings.gradle
+++ b/prebuilts/gradle/NetworkConnect/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'NetworkConnectSample'

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 2287067..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,38 +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.pdfrendererbasic"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
-        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>
-    </application>
-
-
-</manifest>

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/assets/sample.pdf b/prebuilts/gradle/PdfRendererBasic/Application/src/main/assets/sample.pdf
deleted file mode 100644
index 73f68b1..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/assets/sample.pdf
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/java/com/example/android/pdfrendererbasic/MainActivity.java b/prebuilts/gradle/PdfRendererBasic/Application/src/main/java/com/example/android/pdfrendererbasic/MainActivity.java
deleted file mode 100644
index 6b7e8b4..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/java/com/example/android/pdfrendererbasic/MainActivity.java
+++ /dev/null

@@ -1,59 +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.pdfrendererbasic;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-
-public class MainActivity extends Activity {
-
-    public static final String FRAGMENT_PDF_RENDERER_BASIC = "pdf_renderer_basic";
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main_real);
-        if (savedInstanceState == null) {
-            getFragmentManager().beginTransaction()
-                    .add(R.id.container, new PdfRendererBasicFragment(),
-                            FRAGMENT_PDF_RENDERER_BASIC)
-                    .commit();
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.main, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_info:
-                new AlertDialog.Builder(this)
-                        .setMessage(R.string.intro_message)
-                        .setPositiveButton(android.R.string.ok, null)
-                        .show();
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragment.java b/prebuilts/gradle/PdfRendererBasic/Application/src/main/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragment.java
deleted file mode 100644
index e413c65..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/java/com/example/android/pdfrendererbasic/PdfRendererBasicFragment.java
+++ /dev/null

@@ -1,221 +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.pdfrendererbasic;
-
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.pdf.PdfRenderer;
-import android.os.Bundle;
-import android.os.ParcelFileDescriptor;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import java.io.IOException;
-
-/**
- * This fragment has a big {@ImageView} that shows PDF pages, and 2 {@link android.widget.Button}s to move between
- * pages. We use a {@link android.graphics.pdf.PdfRenderer} to render PDF pages as {@link android.graphics.Bitmap}s.
- */
-public class PdfRendererBasicFragment extends Fragment implements View.OnClickListener {
-
-    /**
-     * Key string for saving the state of current page index.
-     */
-    private static final String STATE_CURRENT_PAGE_INDEX = "current_page_index";
-
-    /**
-     * File descriptor of the PDF.
-     */
-    private ParcelFileDescriptor mFileDescriptor;
-
-    /**
-     * {@link android.graphics.pdf.PdfRenderer} to render the PDF.
-     */
-    private PdfRenderer mPdfRenderer;
-
-    /**
-     * Page that is currently shown on the screen.
-     */
-    private PdfRenderer.Page mCurrentPage;
-
-    /**
-     * {@link android.widget.ImageView} that shows a PDF page as a {@link android.graphics.Bitmap}
-     */
-    private ImageView mImageView;
-
-    /**
-     * {@link android.widget.Button} to move to the previous page.
-     */
-    private Button mButtonPrevious;
-
-    /**
-     * {@link android.widget.Button} to move to the next page.
-     */
-    private Button mButtonNext;
-
-    public PdfRendererBasicFragment() {
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_pdf_renderer_basic, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        // Retain view references.
-        mImageView = (ImageView) view.findViewById(R.id.image);
-        mButtonPrevious = (Button) view.findViewById(R.id.previous);
-        mButtonNext = (Button) view.findViewById(R.id.next);
-        // Bind events.
-        mButtonPrevious.setOnClickListener(this);
-        mButtonNext.setOnClickListener(this);
-        // Show the first page by default.
-        int index = 0;
-        // If there is a savedInstanceState (screen orientations, etc.), we restore the page index.
-        if (null != savedInstanceState) {
-            index = savedInstanceState.getInt(STATE_CURRENT_PAGE_INDEX, 0);
-        }
-        showPage(index);
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        try {
-            openRenderer(activity);
-        } catch (IOException e) {
-            e.printStackTrace();
-            Toast.makeText(activity, "Error! " + e.getMessage(), Toast.LENGTH_SHORT).show();
-            activity.finish();
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        try {
-            closeRenderer();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        super.onDetach();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        if (null != mCurrentPage) {
-            outState.putInt(STATE_CURRENT_PAGE_INDEX, mCurrentPage.getIndex());
-        }
-    }
-
-    /**
-     * Sets up a {@link android.graphics.pdf.PdfRenderer} and related resources.
-     */
-    private void openRenderer(Context context) throws IOException {
-        // In this sample, we read a PDF from the assets directory.
-        mFileDescriptor = context.getAssets().openFd("sample.pdf").getParcelFileDescriptor();
-        // This is the PdfRenderer we use to render the PDF.
-        mPdfRenderer = new PdfRenderer(mFileDescriptor);
-    }
-
-    /**
-     * Closes the {@link android.graphics.pdf.PdfRenderer} and related resources.
-     *
-     * @throws java.io.IOException When the PDF file cannot be closed.
-     */
-    private void closeRenderer() throws IOException {
-        if (null != mCurrentPage) {
-            mCurrentPage.close();
-        }
-        mPdfRenderer.close();
-        mFileDescriptor.close();
-    }
-
-    /**
-     * Shows the specified page of PDF to the screen.
-     *
-     * @param index The page index.
-     */
-    private void showPage(int index) {
-        if (mPdfRenderer.getPageCount() <= index) {
-            return;
-        }
-        // Make sure to close the current page before opening another one.
-        if (null != mCurrentPage) {
-            mCurrentPage.close();
-        }
-        // Use `openPage` to open a specific page in PDF.
-        mCurrentPage = mPdfRenderer.openPage(index);
-        // Important: the destination bitmap must be ARGB (not RGB).
-        Bitmap bitmap = Bitmap.createBitmap(mCurrentPage.getWidth(), mCurrentPage.getHeight(),
-                Bitmap.Config.ARGB_8888);
-        // Here, we render the page onto the Bitmap.
-        // To render a portion of the page, use the second and third parameter. Pass nulls to get
-        // the default result.
-        // Pass either RENDER_MODE_FOR_DISPLAY or RENDER_MODE_FOR_PRINT for the last parameter.
-        mCurrentPage.render(bitmap, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY);
-        // We are ready to show the Bitmap to user.
-        mImageView.setImageBitmap(bitmap);
-        updateUi();
-    }
-
-    /**
-     * Updates the state of 2 control buttons in response to the current page index.
-     */
-    private void updateUi() {
-        int index = mCurrentPage.getIndex();
-        int pageCount = mPdfRenderer.getPageCount();
-        mButtonPrevious.setEnabled(0 != index);
-        mButtonNext.setEnabled(index + 1 < pageCount);
-        getActivity().setTitle(getString(R.string.app_name_with_index, index + 1, pageCount));
-    }
-
-    /**
-     * Gets the number of pages in the PDF. This method is marked as public for testing.
-     *
-     * @return The number of pages.
-     */
-    public int getPageCount() {
-        return mPdfRenderer.getPageCount();
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.previous: {
-                // Move to the previous page
-                showPage(mCurrentPage.getIndex() - 1);
-                break;
-            }
-            case R.id.next: {
-                // Move to the next page
-                showPage(mCurrentPage.getIndex() + 1);
-                break;
-            }
-        }
-    }
-
-}

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-hdpi/ic_action_info.png b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-hdpi/ic_action_info.png
deleted file mode 100644
index 32bd1aa..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-hdpi/ic_action_info.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 0c9b694..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-mdpi/ic_action_info.png b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-mdpi/ic_action_info.png
deleted file mode 100644
index 8efbbf8..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-mdpi/ic_action_info.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 1a6c3d0..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xhdpi/ic_action_info.png b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xhdpi/ic_action_info.png
deleted file mode 100644
index ba143ea..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xhdpi/ic_action_info.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 2081f40..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xxhdpi/ic_action_info.png b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xxhdpi/ic_action_info.png
deleted file mode 100644
index 394eb7e..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xxhdpi/ic_action_info.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index b506de4..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index be1aa49..0000000
--- a/prebuilts/gradle/PdfRendererBasic/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/PdfRendererBasic/Application/src/main/res/layout/activity_main_real.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/layout/activity_main_real.xml
deleted file mode 100644
index dcd52be..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/layout/activity_main_real.xml
+++ /dev/null

@@ -1,23 +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.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    tools:ignore="MergeRootFrame" />

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/layout/fragment_pdf_renderer_basic.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/layout/fragment_pdf_renderer_basic.xml
deleted file mode 100644
index 4a7799b..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/layout/fragment_pdf_renderer_basic.xml
+++ /dev/null

@@ -1,56 +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.
--->
-<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=".MainActivity$PlaceholderFragment">
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:background="@android:color/white"
-        android:scaleType="fitCenter" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:measureWithLargestChild="true"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/previous"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/previous" />
-
-        <Button
-            android:id="@+id/next"
-            style="?android:attr/buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/next" />
-    </LinearLayout>
-
-</LinearLayout>

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/menu/main.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/menu/main.xml
deleted file mode 100644
index fa452e1..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/menu/main.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.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/action_info"
-        android:icon="@drawable/ic_action_info"
-        android:showAsAction="always"
-        android:title="@string/info" />
-
-</menu>
\ No newline at end of file

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/PdfRendererBasic/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/PdfRendererBasic/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/PdfRendererBasic/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/PdfRendererBasic/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/values-v11/template-styles.xml
deleted file mode 100644
index 8c1ea66..0000000
--- a/prebuilts/gradle/PdfRendererBasic/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/PdfRendererBasic/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index d97b3c6..0000000
--- a/prebuilts/gradle/PdfRendererBasic/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">PdfRendererBasic</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            This sample demonstrates how to use PdfRenderer to display PDF documents on the screen.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/values/strings.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/values/strings.xml
deleted file mode 100644
index e0182fd..0000000
--- a/prebuilts/gradle/PdfRendererBasic/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="app_name_with_index">PdfRendererBasic (%1$d/%2$d)</string>
-    <string name="info">Info</string>
-    <string name="previous">Previous</string>
-    <string name="next">Next</string>
-
-</resources>

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/PdfRendererBasic/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/PdfRendererBasic/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/PdfRendererBasic/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 6e7d593..0000000
--- a/prebuilts/gradle/PdfRendererBasic/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/PdfRendererBasic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/PdfRendererBasic/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 54829c7..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,41 +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.
-  -->
-<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest
-    package="com.example.android.pdfrendererbasic.tests"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    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:label="Tests for com.example.android.pdfrendererbasic"
-        android:targetPackage="com.example.android.pdfrendererbasic"/>
-
-</manifest>

diff --git a/prebuilts/gradle/PdfRendererBasic/Application/tests/src/com/example/android/pdfrendererbasic/tests/PdfRendererBasicFragmentTests.java b/prebuilts/gradle/PdfRendererBasic/Application/tests/src/com/example/android/pdfrendererbasic/tests/PdfRendererBasicFragmentTests.java
deleted file mode 100644
index 0f94cbf..0000000
--- a/prebuilts/gradle/PdfRendererBasic/Application/tests/src/com/example/android/pdfrendererbasic/tests/PdfRendererBasicFragmentTests.java
+++ /dev/null

@@ -1,132 +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.pdfrendererbasic.tests;
-
-import android.content.pm.ActivityInfo;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.TouchUtils;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.view.View;
-import android.widget.Button;
-
-import com.example.android.pdfrendererbasic.MainActivity;
-import com.example.android.pdfrendererbasic.PdfRendererBasicFragment;
-import com.example.android.pdfrendererbasic.R;
-
-/**
- * Tests for PdfRendererBasic sample.
- */
-public class PdfRendererBasicFragmentTests extends ActivityInstrumentationTestCase2<MainActivity> {
-
-    private MainActivity mActivity;
-    private PdfRendererBasicFragment mFragment;
-
-    private Button mButtonPrevious;
-    private Button mButtonNext;
-
-    public PdfRendererBasicFragmentTests() {
-        super(MainActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mFragment = (PdfRendererBasicFragment) mActivity.getFragmentManager()
-                .findFragmentByTag(MainActivity.FRAGMENT_PDF_RENDERER_BASIC);
-    }
-
-    @LargeTest
-    public void testActivityTitle() {
-        // The title of the activity should be "PdfRendererBasic (1/10)" at first
-        String expectedActivityTitle = mActivity.getString(R.string.app_name_with_index, 1,
-                mFragment.getPageCount());
-        assertEquals(expectedActivityTitle, mActivity.getTitle());
-    }
-
-    @LargeTest
-    public void testButtons_previousDisabledAtFirst() {
-        setUpButtons();
-        // Check that the previous button is disabled at first
-        assertFalse(mButtonPrevious.isEnabled());
-        // The next button should be enabled
-        assertTrue(mButtonNext.isEnabled());
-    }
-
-    @LargeTest
-    public void testButtons_bothEnabledInMiddle() {
-        setUpButtons();
-        turnPages(1);
-        // Two buttons should be both enabled
-        assertTrue(mButtonPrevious.isEnabled());
-        assertTrue(mButtonNext.isEnabled());
-    }
-
-    @LargeTest
-    public void testButtons_nextDisabledLastPage() {
-        setUpButtons();
-        int pageCount = mFragment.getPageCount();
-        // Click till it reaches the last page
-        turnPages(pageCount - 1);
-        // Check the page count
-        String expectedActivityTitle = mActivity.getString(R.string.app_name_with_index,
-                pageCount, pageCount);
-        assertEquals(expectedActivityTitle, mActivity.getTitle());
-        // The previous button should be enabled
-        assertTrue(mButtonPrevious.isEnabled());
-        // Check that the next button is disabled
-        assertFalse(mButtonNext.isEnabled());
-    }
-
-    @LargeTest
-    public void testOrientationChangePreserveState() {
-        mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        setUpButtons();
-        turnPages(1);
-        int pageCount = mFragment.getPageCount();
-        String expectedActivityTitle = mActivity.getString(R.string.app_name_with_index,
-                2, pageCount);
-        assertEquals(expectedActivityTitle, mActivity.getTitle());
-        mActivity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        // Check that the title is the same after orientation change
-        assertEquals(expectedActivityTitle, mActivity.getTitle());
-    }
-
-    /**
-     * Prepares references to the buttons "Previous" and "Next".
-     */
-    private void setUpButtons() {
-        View view = mFragment.getView();
-        assertNotNull(view);
-        mButtonPrevious = (Button) view.findViewById(R.id.previous);
-        assertNotNull(mButtonPrevious);
-        mButtonNext = (Button) view.findViewById(R.id.next);
-        assertNotNull(mButtonNext);
-    }
-
-    /**
-     * Click the "Next" button to turn the pages.
-     *
-     * @param count The number of times to turn pages.
-     */
-    private void turnPages(int count) {
-        for (int i = 0; i < count; ++i) {
-            TouchUtils.clickView(this, mButtonNext);
-        }
-    }
-
-}

diff --git a/prebuilts/gradle/PdfRendererBasic/CONTRIB.md b/prebuilts/gradle/PdfRendererBasic/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/PdfRendererBasic/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/PdfRendererBasic/LICENSE b/prebuilts/gradle/PdfRendererBasic/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/PdfRendererBasic/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/PdfRendererBasic/build.gradle b/prebuilts/gradle/PdfRendererBasic/build.gradle
deleted file mode 100644
index 5cf5d3d..0000000
--- a/prebuilts/gradle/PdfRendererBasic/build.gradle
+++ /dev/null

@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/prebuilts/gradle/PdfRendererBasic/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/PdfRendererBasic/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/gradle/PdfRendererBasic/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/PdfRendererBasic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/PdfRendererBasic/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index d7f03cf..0000000
--- a/prebuilts/gradle/PdfRendererBasic/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-#Wed Apr 10 15:27:10 PDT 2013
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip

diff --git a/prebuilts/gradle/PdfRendererBasic/gradlew b/prebuilts/gradle/PdfRendererBasic/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/PdfRendererBasic/gradlew
+++ /dev/null

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/prebuilts/gradle/PdfRendererBasic/gradlew.bat b/prebuilts/gradle/PdfRendererBasic/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/prebuilts/gradle/PdfRendererBasic/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/PdfRendererBasic/settings.gradle b/prebuilts/gradle/PdfRendererBasic/settings.gradle
deleted file mode 100644
index 9464a35..0000000
--- a/prebuilts/gradle/PdfRendererBasic/settings.gradle
+++ /dev/null

@@ -1 +0,0 @@
-include 'Application'

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
deleted file mode 100644
index 3228927..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/common/logger/Log.java
deleted file mode 100644
index 17503c5..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/common/logger/LogFragment.java
deleted file mode 100644
index b302acd..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/common/logger/LogNode.java
deleted file mode 100644
index bc37cab..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/common/logger/LogView.java
deleted file mode 100644
index c01542b..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
deleted file mode 100644
index 16a9e7b..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
deleted file mode 100644
index 19967dc..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/java/com/example/android/recyclerview/CustomAdapter.java b/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/recyclerview/CustomAdapter.java
deleted file mode 100644
index f8e3bae..0000000
--- a/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/recyclerview/CustomAdapter.java
+++ /dev/null

@@ -1,91 +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.recyclerview;
-
-import com.example.android.common.logger.Log;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-/**
- * Provide views to RecyclerView with data from mDataSet.
- */
-public class CustomAdapter extends RecyclerView.Adapter<CustomAdapter.ViewHolder> {
-    private static final String TAG = "CustomAdapter";
-
-    private String[] mDataSet;
-
-    // BEGIN_INCLUDE(recyclerViewSampleViewHolder)
-    /**
-     * Provide a reference to the type of views that you are using (custom viewholder)
-     */
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-        private final TextView mTextView;
-
-        public ViewHolder(View v) {
-            super(v);
-            mTextView = (TextView) v.findViewById(R.id.textView);
-        }
-
-        public TextView getmTextView() {
-            return mTextView;
-        }
-    }
-    // END_INCLUDE(recyclerViewSampleViewHolder)
-    /**
-     * Initialize the dataset of the Adapter.
-     *
-     * @param dataSet String[] containing the data to populate views to be used by RecyclerView.
-     */
-    public CustomAdapter(String[] dataSet) {
-        mDataSet = dataSet;
-    }
-
-    // BEGIN_INCLUDE(recyclerViewOnCreateViewHolder)
-    // Create new views (invoked by the layout manager)
-    @Override
-    public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int position) {
-        // Create a new view.
-        View v = LayoutInflater.from(viewGroup.getContext())
-                .inflate(R.layout.text_row_item, viewGroup, false);
-
-        ViewHolder vh = new ViewHolder(v);
-        return vh;
-    }
-    // END_INCLUDE(recyclerViewOnCreateViewHolder)
-
-    // BEGIN_INCLUDE(recyclerViewOnBindViewHolder)
-    // Replace the contents of a view (invoked by the layout manager)
-    @Override
-    public void onBindViewHolder(ViewHolder viewHolder, int position) {
-        Log.d(TAG, "Element " + position + " set.");
-
-        // Get element from your dataset at this position and replace the contents of the view
-        // with that element
-        viewHolder.getmTextView().setText(mDataSet[position]);
-    }
-    // END_INCLUDE(recyclerViewOnBindViewHolder)
-
-    // Return the size of your dataset (invoked by the layout manager)
-    @Override
-    public int getItemCount() {
-        return mDataSet.length;
-    }
-}

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/recyclerview/MainActivity.java b/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/recyclerview/MainActivity.java
deleted file mode 100644
index 7556067..0000000
--- a/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/recyclerview/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.recyclerview;
-
-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();
-            RecyclerViewFragment fragment = new RecyclerViewFragment();
-            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/RecyclerView/Application/src/main/java/com/example/android/recyclerview/RecyclerViewFragment.java b/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/recyclerview/RecyclerViewFragment.java
deleted file mode 100644
index 4f4a596..0000000
--- a/prebuilts/gradle/RecyclerView/Application/src/main/java/com/example/android/recyclerview/RecyclerViewFragment.java
+++ /dev/null

@@ -1,81 +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.recyclerview;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * Demonstrates the use of RecyclerView with a LinearLayoutManager.
- */
-public class RecyclerViewFragment extends Fragment {
-
-    private static final String TAG = "RecyclerViewFragment";
-
-    protected RecyclerView mRecyclerView;
-    protected RecyclerView.Adapter mAdapter;
-    protected RecyclerView.LayoutManager mLayoutManager;
-    protected String[] mDataset;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Initialize dataset, this data would usually come from a local content provider or
-        // remote server.
-        initDataset();
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.recycler_view_frag, container, false);
-        rootView.setTag(TAG);
-
-        // BEGIN_INCLUDE(initializeRecyclerView)
-        mRecyclerView = (RecyclerView) rootView.findViewById(R.id.recyclerView);
-
-        // LinearLayoutManager is used here, this will layout the elements in a similar fashion
-        // to the way ListView would layout elements. The RecyclerView.LayoutManager defines how
-        // elements are laid out.
-        mLayoutManager = new LinearLayoutManager(getActivity());
-        mRecyclerView.setLayoutManager(mLayoutManager);
-
-        mAdapter = new CustomAdapter(mDataset);
-        // Set CustomAdapter as the adapter for RecyclerView.
-        mRecyclerView.setAdapter(mAdapter);
-        // END_INCLUDE(initializeRecyclerView)
-
-        return rootView;
-    }
-
-    /**
-     * Generates Strings for RecyclerView's adapter. This data would usually come
-     * from a local content provider or remote server.
-     */
-    private void initDataset() {
-        mDataset = new String[60];
-        for (int i=0; i < 60; i++) {
-            mDataset[i] = "This is element #" + i;
-        }
-    }
-}

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index bcb72b1..0000000
--- a/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 37e5bce..0000000
--- a/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 1c4a85a..0000000
--- a/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index b26545c..0000000
--- a/prebuilts/gradle/RecyclerView/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/layout-w720dp/activity_main.xml
deleted file mode 100755
index c9a52f6..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index 1ae4f98..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/res/layout/recycler_view_frag.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/layout/recycler_view_frag.xml
deleted file mode 100644
index 6682468..0000000
--- a/prebuilts/gradle/RecyclerView/Application/src/main/res/layout/recycler_view_frag.xml
+++ /dev/null

@@ -1,28 +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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</FrameLayout>

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/res/layout/text_row_item.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/layout/text_row_item.xml
deleted file mode 100644
index d552e0e..0000000
--- a/prebuilts/gradle/RecyclerView/Application/src/main/res/layout/text_row_item.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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_margin="@dimen/margin_small"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content">
-
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/element_text"
-        android:id="@+id/textView"
-        android:layout_gravity="center_horizontal"/>
-</LinearLayout>
\ No newline at end of file

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/res/menu/main.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/menu/main.xml
deleted file mode 100644
index b49c2c5..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/values-v11/template-styles.xml
deleted file mode 100644
index 8c1ea66..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index b6efd8e..0000000
--- a/prebuilts/gradle/RecyclerView/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">RecyclerView</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            Demonstration of using RecyclerView with a LayoutManager to create a vertical ListView.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/values/fragmentview_strings.xml
deleted file mode 100755
index 7b9d9ec..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/res/values/strings.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/values/strings.xml
deleted file mode 100644
index 179529c..0000000
--- a/prebuilts/gradle/RecyclerView/Application/src/main/res/values/strings.xml
+++ /dev/null

@@ -1,20 +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="element_text">Element</string>
-</resources>
\ No newline at end of file

diff --git a/prebuilts/gradle/RecyclerView/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/RecyclerView/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 6e7d593..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/CONTRIB.md b/prebuilts/gradle/RecyclerView/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/LICENSE b/prebuilts/gradle/RecyclerView/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/README.md b/prebuilts/gradle/RecyclerView/README.md
deleted file mode 100644
index fdfa4f1..0000000
--- a/prebuilts/gradle/RecyclerView/README.md
+++ /dev/null

@@ -1,49 +0,0 @@
-Android RecyclerView Sample
-===========================
-
-Demonstration of using RecyclerView with a LinearLayoutManager to create a vertical ListView.
-
-Pre-requisites
---------------
-
-- Android SDK (L Developer Preview)
-- Android Build Tools v20
-- Android Support Repository
-
-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-BasicAndroidKeyStore
-
-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/RecyclerView/build.gradle b/prebuilts/gradle/RecyclerView/build.gradle
deleted file mode 100644
index 5cf5d3d..0000000
--- a/prebuilts/gradle/RecyclerView/build.gradle
+++ /dev/null

@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/prebuilts/gradle/RecyclerView/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/RecyclerView/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/gradle/RecyclerView/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RecyclerView/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/RecyclerView/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 65fb80a..0000000
--- a/prebuilts/gradle/RecyclerView/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-#Mon Sep 08 13:53:18 PDT 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip

diff --git a/prebuilts/gradle/RecyclerView/gradlew b/prebuilts/gradle/RecyclerView/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/RecyclerView/gradlew
+++ /dev/null

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/prebuilts/gradle/RecyclerView/gradlew.bat b/prebuilts/gradle/RecyclerView/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/prebuilts/gradle/RecyclerView/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/RecyclerView/packaging.yaml b/prebuilts/gradle/RecyclerView/packaging.yaml
deleted file mode 100644
index 8554a96..0000000
--- a/prebuilts/gradle/RecyclerView/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:   [UI]
-languages:    [Java]
-solutions:    [Mobile]
-github:       googlesamples/android-RecyclerView
-level:        INTERMEDIATE
-icon:         RecyclerViewSample/src/main/res/drawable-xxhdpi/ic_launcher.png
-doc_refs:
-    - android:preview/material/ui-widgets.html
-license: apache2

diff --git a/prebuilts/gradle/RecyclerView/settings.gradle b/prebuilts/gradle/RecyclerView/settings.gradle
deleted file mode 100644
index 9464a35..0000000
--- a/prebuilts/gradle/RecyclerView/settings.gradle
+++ /dev/null

@@ -1 +0,0 @@
-include 'Application'

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index e108aff..0000000
--- a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,43 +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.renderscriptintrinsic"
-    android:versionCode="1"
-    android:versionName="1.0">
-
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <application
-        android:allowBackup="true"
-        android:label="RenderScriptIntrinsic"
-        android:icon="@drawable/ic_launcher"
-        android:theme="@style/AppTheme">
-
-        <activity
-            android:name=".MainActivity"
-            android:label="RenderScriptIntrinsic"
-            android:theme="@style/FullscreenTheme">
-            <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/RenderScriptIntrinsic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/RenderScriptIntrinsic/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 72f0969..0000000
--- a/prebuilts/gradle/RenderScriptIntrinsic/Application/tests/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.
-  -->
-<!-- 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.renderscriptintrinsic.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.renderscriptintrinsic"
-            android:label="Tests for com.example.android.renderscriptintrinsic" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle
new file mode 100644
index 0000000..239fe02
--- /dev/null
+++ b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/build.gradle

@@ -0,0 +1,70 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+repositories {
+    jcenter()
+}
+
+
+dependencies {
+
+
+
+    compile files('renderscript-v8.jar')
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    sourceSets {
+        main {
+            dirs.each { dir ->
+                java.srcDirs "src/${dir}/java"
+                res.srcDirs "src/${dir}/res"
+            }
+        }
+        androidTest.setRoot('tests')
+        androidTest.java.srcDirs = ['tests/src']
+
+        defaultConfig {
+        
+        renderscriptTargetApi 18
+        renderscriptSupportMode true
+    
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/AndroidManifest.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..566ef8a
--- /dev/null
+++ b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/AndroidManifest.xml

@@ -0,0 +1,45 @@
+<?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.renderscriptintrinsic"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="19" />
+
+    <application
+        android:allowBackup="true"
+        android:label="RenderScriptIntrinsic"
+        android:icon="@drawable/ic_launcher"
+        android:theme="@style/AppTheme">
+
+        <activity
+            android:name=".MainActivity"
+            android:label="RenderScriptIntrinsic"
+            android:theme="@style/FullscreenTheme">
+            <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/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/MainActivity.java

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/java/com/example/android/renderscriptintrinsic/ThumbnailRadioButton.java

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-nodpi/data.jpg b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-nodpi/data.jpg
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-nodpi/data.jpg
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-nodpi/data.jpg
Binary files differ

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/layout/main_layout.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/layout/main_layout.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/layout/main_layout.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/layout/main_layout.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v11/styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v11/styles.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v14/styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values-v14/styles.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/attrs.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/attrs.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/attrs.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/colors.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/colors.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/colors.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/AndroidManifest.xml b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..96fa207
--- /dev/null
+++ b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.
+  -->
+<!-- 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.renderscriptintrinsic.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="8"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.renderscriptintrinsic"
+            android:label="Tests for com.example.android.renderscriptintrinsic" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/Application/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java b/prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/RenderScriptIntrinsic/Application/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java
rename to prebuilts/gradle/RenderScriptIntrinsic/RenderScriptIntrinsicSample/tests/src/com/example/android/renderscriptintrinsic/tests/SampleTests.java

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/RenderScriptIntrinsic/gradle/wrapper/gradle-wrapper.properties
index 42b0b0f..0f9e485 100644
--- a/prebuilts/gradle/RenderScriptIntrinsic/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/RenderScriptIntrinsic/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/RenderScriptIntrinsic/settings.gradle b/prebuilts/gradle/RenderScriptIntrinsic/settings.gradle
index 9464a35..702ca57 100644
--- a/prebuilts/gradle/RenderScriptIntrinsic/settings.gradle
+++ b/prebuilts/gradle/RenderScriptIntrinsic/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'RenderScriptIntrinsicSample'

diff --git a/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/build.gradle b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/RepeatingAlarm/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/repeatingalarm/MainActivity.java b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/repeatingalarm/MainActivity.java
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/MainActivity.java

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/java/com/example/android/repeatingalarm/RepeatingAlarmFragment.java

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout-sw600dp-land/activity_main.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout-sw600dp/activity_main.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/menu/main.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/strings.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/RepeatingAlarm/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/RepeatingAlarm/RepeatingAlarmSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/RepeatingAlarm/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/RepeatingAlarm/settings.gradle b/prebuilts/gradle/RepeatingAlarm/settings.gradle
index 9464a35..0f14173 100644
--- a/prebuilts/gradle/RepeatingAlarm/settings.gradle
+++ b/prebuilts/gradle/RepeatingAlarm/settings.gradle

@@ -1 +1 @@
-include 'Application'
+include 'RepeatingAlarmSample'

diff --git a/prebuilts/gradle/RevealEffectBasic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index da8646b..0000000
--- a/prebuilts/gradle/RevealEffectBasic/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,41 +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.
--->
-
-
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.revealeffectbasic"
-    android:versionCode="1"
-    android:versionName="1.0"
-    android:uiOptions="splitActionBarWhenNarrow">
-
-    <application android:allowBackup="true"
-        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
-        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>
-    </application>
-
-
-</manifest>

diff --git a/prebuilts/gradle/RevealEffectBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/RevealEffectBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
deleted file mode 100644
index 3228927..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/Log.java
deleted file mode 100644
index 17503c5..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
deleted file mode 100644
index b302acd..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java
deleted file mode 100644
index bc37cab..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogView.java
deleted file mode 100644
index c01542b..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
deleted file mode 100644
index 16a9e7b..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/RevealEffectBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
deleted file mode 100644
index 19967dc..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/MainActivity.java b/prebuilts/gradle/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/MainActivity.java
deleted file mode 100644
index e9b27d9..0000000
--- a/prebuilts/gradle/RevealEffectBasic/Application/src/main/java/com/example/android/revealeffectbasic/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.revealeffectbasic;
-
-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();
-            RevealEffectBasicFragment fragment = new RevealEffectBasicFragment();
-            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/RevealEffectBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 5acc60a..0000000
--- a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index d3977a6..0000000
--- a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71532a7..0000000
--- a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 33d9879..0000000
--- a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/layout-w720dp/activity_main.xml
deleted file mode 100755
index c9a52f6..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/layout/activity_main.xml
deleted file mode 100755
index 1ae4f98..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/res/menu/main.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/menu/main.xml
deleted file mode 100644
index b49c2c5..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/values-v11/template-styles.xml
deleted file mode 100644
index 8c1ea66..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index b4aa183..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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">RevealEffectBasic</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            Basic sample to demonstrate the reveal effect.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/values/dimens.xml
deleted file mode 100644
index e0ffc06..0000000
--- a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/values/dimens.xml
+++ /dev/null

@@ -1,19 +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>
-    <dimen name="shape_size">128dp</dimen>
-</resources>

diff --git a/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/values/fragmentview_strings.xml
deleted file mode 100755
index 7b9d9ec..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/RevealEffectBasic/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index 6e7d593..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/RevealEffectBasic/Application/tests/AndroidManifest.xml
deleted file mode 100644
index a0d25c1..0000000
--- a/prebuilts/gradle/RevealEffectBasic/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.revealeffectbasic.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.revealeffectbasic"
-            android:label="Tests for com.example.android.revealeffectbasic" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/RevealEffectBasic/Application/tests/src/com/example/android/revealeffectbasic/tests/SampleTests.java b/prebuilts/gradle/RevealEffectBasic/Application/tests/src/com/example/android/revealeffectbasic/tests/SampleTests.java
deleted file mode 100644
index 249f1ef..0000000
--- a/prebuilts/gradle/RevealEffectBasic/Application/tests/src/com/example/android/revealeffectbasic/tests/SampleTests.java
+++ /dev/null

@@ -1,75 +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 (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.revealeffectbasic.tests;
-
-import com.example.android.revealeffectbasic.*;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
-* Tests for RevealEffectBasic sample.
-*/
-public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> {
-
-    private MainActivity mTestActivity;
-    private RevealEffectBasicFragment 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 = (RevealEffectBasicFragment)
-            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);
-        assertNotNull("Circle view is null", mTestActivity.findViewById(R.id.circle));
-    }
-}
\ No newline at end of file

diff --git a/prebuilts/gradle/RevealEffectBasic/CONTRIB.md b/prebuilts/gradle/RevealEffectBasic/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/LICENSE b/prebuilts/gradle/RevealEffectBasic/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/build.gradle b/prebuilts/gradle/RevealEffectBasic/build.gradle
deleted file mode 100644
index 5cf5d3d..0000000
--- a/prebuilts/gradle/RevealEffectBasic/build.gradle
+++ /dev/null

@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/prebuilts/gradle/RevealEffectBasic/gradle/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/RevealEffectBasic/gradle/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 5838598..0000000
--- a/prebuilts/gradle/RevealEffectBasic/gradle/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RevealEffectBasic/gradle/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/RevealEffectBasic/gradle/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 02df8c4..0000000
--- a/prebuilts/gradle/RevealEffectBasic/gradle/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-#Fri May 23 13:44:29 BST 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip

diff --git a/prebuilts/gradle/RevealEffectBasic/gradle/gradlew b/prebuilts/gradle/RevealEffectBasic/gradle/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/RevealEffectBasic/gradle/gradlew
+++ /dev/null

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/prebuilts/gradle/RevealEffectBasic/gradle/gradlew.bat b/prebuilts/gradle/RevealEffectBasic/gradle/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/prebuilts/gradle/RevealEffectBasic/gradle/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/RevealEffectBasic/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/RevealEffectBasic/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/gradle/RevealEffectBasic/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/RevealEffectBasic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/RevealEffectBasic/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 19c6ed1..0000000
--- a/prebuilts/gradle/RevealEffectBasic/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-#Wed Apr 10 15:27:10 PDT 2013
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip

diff --git a/prebuilts/gradle/RevealEffectBasic/gradlew b/prebuilts/gradle/RevealEffectBasic/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/RevealEffectBasic/gradlew
+++ /dev/null

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/prebuilts/gradle/RevealEffectBasic/gradlew.bat b/prebuilts/gradle/RevealEffectBasic/gradlew.bat
deleted file mode 100644
index aec9973..0000000
--- a/prebuilts/gradle/RevealEffectBasic/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/RevealEffectBasic/settings.gradle b/prebuilts/gradle/RevealEffectBasic/settings.gradle
deleted file mode 100644
index 9464a35..0000000
--- a/prebuilts/gradle/RevealEffectBasic/settings.gradle
+++ /dev/null

@@ -1 +0,0 @@
-include 'Application'

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/MainActivity.java b/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/MainActivity.java
deleted file mode 100644
index d7d2ff5..0000000
--- a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/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.slidingtabsbasic;
-
-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();
-            SlidingTabsBasicFragment fragment = new SlidingTabsBasicFragment();
-            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/SlidingTabsBasic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/SlidingTabsBasic/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 3b7394c..0000000
--- a/prebuilts/gradle/SlidingTabsBasic/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.slidingtabsbasic.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.slidingtabsbasic"
-            android:label="Tests for com.example.android.slidingtabsbasic" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/build.gradle b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/SlidingTabsBasic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java

diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/MainActivity.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/MainActivity.java
new file mode 100644
index 0000000..3f808bb
--- /dev/null
+++ b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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.slidingtabsbasic;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        SlidingTabsBasicFragment fragment = new SlidingTabsBasicFragment();
+        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/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/java/com/example/android/slidingtabsbasic/SlidingTabsBasicFragment.java

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/fragment_sample.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/fragment_sample.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/fragment_sample.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/pager_item.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/pager_item.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/layout/pager_item.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/layout/pager_item.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/menu/main.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/tests/AndroidManifest.xml b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..8d8fa2b
--- /dev/null
+++ b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/tests/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?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
+
+  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.slidingtabsbasic.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="4"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.slidingtabsbasic"
+            android:label="Tests for com.example.android.slidingtabsbasic" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/SlidingTabsBasic/Application/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java b/prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsBasic/Application/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java
rename to prebuilts/gradle/SlidingTabsBasic/SlidingTabsBasicSample/tests/src/com/example/android/slidingtabsbasic/tests/SampleTests.java

diff --git a/prebuilts/gradle/SlidingTabsBasic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/SlidingTabsBasic/gradle/wrapper/gradle-wrapper.properties
index 7dc3dff..d647dee 100644
--- a/prebuilts/gradle/SlidingTabsBasic/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/SlidingTabsBasic/gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
 

diff --git a/prebuilts/gradle/SlidingTabsBasic/settings.gradle b/prebuilts/gradle/SlidingTabsBasic/settings.gradle
index 9464a35..4accfbd 100644
--- a/prebuilts/gradle/SlidingTabsBasic/settings.gradle
+++ b/prebuilts/gradle/SlidingTabsBasic/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'SlidingTabsBasicSample'

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/MainActivity.java b/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/MainActivity.java
deleted file mode 100644
index dc1205b..0000000
--- a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/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.slidingtabscolors;
-
-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();
-            SlidingTabsColorsFragment fragment = new SlidingTabsColorsFragment();
-            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/SlidingTabsColors/Application/tests/AndroidManifest.xml b/prebuilts/gradle/SlidingTabsColors/Application/tests/AndroidManifest.xml
deleted file mode 100644
index b018f6c..0000000
--- a/prebuilts/gradle/SlidingTabsColors/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,41 +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.
--->
-
-<!-- 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.slidingtabscolors.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.slidingtabscolors"
-            android:label="Tests for com.example.android.slidingtabscolors" />
-
-</manifest>

diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/build.gradle b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/SlidingTabsColors/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/ContentFragment.java

diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/MainActivity.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/MainActivity.java
new file mode 100644
index 0000000..b4293b6
--- /dev/null
+++ b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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.slidingtabscolors;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        SlidingTabsColorsFragment fragment = new SlidingTabsColorsFragment();
+        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/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/java/com/example/android/slidingtabscolors/SlidingTabsColorsFragment.java

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/fragment_sample.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/fragment_sample.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/fragment_sample.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/pager_item.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/pager_item.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/layout/pager_item.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/layout/pager_item.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/menu/main.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/strings.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/tests/AndroidManifest.xml b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..f9fcf3e
--- /dev/null
+++ b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/tests/AndroidManifest.xml

@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<!-- 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.slidingtabscolors.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="4"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.slidingtabscolors"
+            android:label="Tests for com.example.android.slidingtabscolors" />
+
+</manifest>

diff --git a/prebuilts/gradle/SlidingTabsColors/Application/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java b/prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/SlidingTabsColors/Application/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java
rename to prebuilts/gradle/SlidingTabsColors/SlidingTabsColorsSample/tests/src/com/example/android/slidingtabscolors/tests/SampleTests.java

diff --git a/prebuilts/gradle/SlidingTabsColors/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/SlidingTabsColors/gradle/wrapper/gradle-wrapper.properties
index 5fbce39..2ea0b84 100644
--- a/prebuilts/gradle/SlidingTabsColors/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/SlidingTabsColors/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip

diff --git a/prebuilts/gradle/SlidingTabsColors/settings.gradle b/prebuilts/gradle/SlidingTabsColors/settings.gradle
index 9464a35..3c5586a 100644
--- a/prebuilts/gradle/SlidingTabsColors/settings.gradle
+++ b/prebuilts/gradle/SlidingTabsColors/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'SlidingTabsColorsSample'

diff --git a/prebuilts/gradle/StorageClient/Application/tests/AndroidManifest.xml b/prebuilts/gradle/StorageClient/Application/tests/AndroidManifest.xml
deleted file mode 100644
index ffcac1d..0000000
--- a/prebuilts/gradle/StorageClient/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.storageclient.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.storageclient"
-            android:label="Tests for com.example.android.storageclient" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/build.gradle b/prebuilts/gradle/StorageClient/StorageClientSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/StorageClient/StorageClientSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/StorageClient/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/storageclient/MainActivity.java b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/storageclient/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/storageclient/MainActivity.java
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/storageclient/MainActivity.java

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/storageclient/StorageClientFragment.java b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/storageclient/StorageClientFragment.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/java/com/example/android/storageclient/StorageClientFragment.java
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/java/com/example/android/storageclient/StorageClientFragment.java

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout-sw600dp-land/activity_main.xml

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout-sw600dp/activity_main.xml

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/menu/main.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/values/strings.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/StorageClient/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/StorageClient/StorageClientSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/StorageClient/StorageClientSample/tests/AndroidManifest.xml b/prebuilts/gradle/StorageClient/StorageClientSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..3f0a38f
--- /dev/null
+++ b/prebuilts/gradle/StorageClient/StorageClientSample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.storageclient.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="19"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.storageclient"
+            android:label="Tests for com.example.android.storageclient" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/StorageClient/Application/tests/src/com/example/android/storageclient/tests/SampleTests.java b/prebuilts/gradle/StorageClient/StorageClientSample/tests/src/com/example/android/storageclient/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/StorageClient/Application/tests/src/com/example/android/storageclient/tests/SampleTests.java
rename to prebuilts/gradle/StorageClient/StorageClientSample/tests/src/com/example/android/storageclient/tests/SampleTests.java

diff --git a/prebuilts/gradle/StorageClient/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/StorageClient/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/StorageClient/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/StorageClient/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/StorageClient/settings.gradle b/prebuilts/gradle/StorageClient/settings.gradle
index 9464a35..73cfad8 100644
--- a/prebuilts/gradle/StorageClient/settings.gradle
+++ b/prebuilts/gradle/StorageClient/settings.gradle

@@ -1 +1 @@
-include 'Application'
+include 'StorageClientSample'

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/StorageProvider/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 53e7819..0000000
--- a/prebuilts/gradle/StorageProvider/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,69 +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.
--->
-
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.example.android.storageprovider"
-          android:versionCode="1"
-          android:versionName="1.0">
-
-    <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle -->
-
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <application
-        android:allowBackup="true"
-        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
-        android:theme="@style/MyAppTheme">
-
-        <activity
-            android:name=".MainActivity"
-            android:uiOptions="splitActionBarWhenNarrow"
-            android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-
-        <!--BEGIN_INCLUDE(provider_manifest)-->
-        <!--
-        Declare the document provider class MyCloudProvider to the system.  The MANAGE_DOCUMENTS
-        permission belongs only to the Android system, ensuring this provider will never be used
-        directly by another app.  The provider must grant URI permissions in order to expose the
-        specific documents(s) chosen, while not sharing all of its data by default.  It must be
-        exported to be visible outside the application, and it must include a filter with the intent
-        "android.content.action.DOCUMENTS_PROVIDER" in order to be shown in the system document
-        picker UI.
-        -->
-        <provider
-            android:name="com.example.android.storageprovider.MyCloudProvider"
-            android:authorities="com.example.android.storageprovider.documents"
-            android:grantUriPermissions="true"
-            android:exported="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS">
-            <intent-filter>
-                <action android:name="android.content.action.DOCUMENTS_PROVIDER"/>
-            </intent-filter>
-        </provider>
-        <!--END_INCLUDE(provider_manifest)-->
-
-    </application>
-
-</manifest>

diff --git a/prebuilts/gradle/StorageProvider/StorageProviderSample/build.gradle b/prebuilts/gradle/StorageProvider/StorageProviderSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/StorageProvider/StorageProviderSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/StorageProvider/StorageProviderSample/src/main/AndroidManifest.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..e4704dc
--- /dev/null
+++ b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/AndroidManifest.xml

@@ -0,0 +1,71 @@
+<?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.storageprovider"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+        android:minSdkVersion="19"
+        android:targetSdkVersion="19"/>
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:icon="@drawable/ic_launcher"
+        android:theme="@style/MyAppTheme">
+
+        <activity
+            android:name=".MainActivity"
+            android:uiOptions="splitActionBarWhenNarrow"
+            android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <!--BEGIN_INCLUDE(provider_manifest)-->
+        <!--
+        Declare the document provider class MyCloudProvider to the system.  The MANAGE_DOCUMENTS
+        permission belongs only to the Android system, ensuring this provider will never be used
+        directly by another app.  The provider must grant URI permissions in order to expose the
+        specific documents(s) chosen, while not sharing all of its data by default.  It must be
+        exported to be visible outside the application, and it must include a filter with the intent
+        "android.content.action.DOCUMENTS_PROVIDER" in order to be shown in the system document
+        picker UI.
+        -->
+        <provider
+            android:name="com.example.android.storageprovider.MyCloudProvider"
+            android:authorities="com.example.android.storageprovider.documents"
+            android:grantUriPermissions="true"
+            android:exported="true"
+            android:permission="android.permission.MANAGE_DOCUMENTS">
+            <intent-filter>
+                <action android:name="android.content.action.DOCUMENTS_PROVIDER"/>
+            </intent-filter>
+        </provider>
+        <!--END_INCLUDE(provider_manifest)-->
+
+    </application>
+
+</manifest>

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MainActivity.java b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MainActivity.java
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MainActivity.java

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudFragment.java b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudFragment.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudFragment.java
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudFragment.java

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudProvider.java b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudProvider.java
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudProvider.java
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/java/com/example/android/storageprovider/MyCloudProvider.java

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/layout-sw600dp-land/activity_main.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout-sw600dp-land/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/layout-sw600dp-land/activity_main.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout-sw600dp-land/activity_main.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/layout-sw600dp/activity_main.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout-sw600dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/layout-sw600dp/activity_main.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout-sw600dp/activity_main.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/menu/main.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_computer_android_studio.jpg b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_android_studio.jpg
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_computer_android_studio.jpg
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_android_studio.jpg
Binary files differ

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_computer_back.jpg b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_back.jpg
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_computer_back.jpg
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_computer_back.jpg
Binary files differ

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_dinner.jpg b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_dinner.jpg
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_dinner.jpg
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_dinner.jpg
Binary files differ

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_pumpkins_fall.jpg b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_pumpkins_fall.jpg
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_pumpkins_fall.jpg
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_pumpkins_fall.jpg
Binary files differ

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_rose.jpg b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_rose.jpg
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/raw/android_rose.jpg
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/android_rose.jpg
Binary files differ

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/cat_names.txt b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/cat_names.txt
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/raw/cat_names.txt
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/cat_names.txt

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/dog_names.txt b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/dog_names.txt
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/raw/dog_names.txt
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/dog_names.txt

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/raw/example.docx b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/example.docx
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/raw/example.docx
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/raw/example.docx
Binary files differ

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/values/app_strings.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/app_strings.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/values/app_strings.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/app_strings.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/values/arrays.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/arrays.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/values/arrays.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/arrays.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/values/strings.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/values/styles.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/StorageProvider/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/StorageProvider/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/StorageProvider/StorageProviderSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/StorageProvider/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/StorageProvider/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/StorageProvider/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/StorageProvider/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/StorageProvider/settings.gradle b/prebuilts/gradle/StorageProvider/settings.gradle
index 9464a35..d4b818f 100644
--- a/prebuilts/gradle/StorageProvider/settings.gradle
+++ b/prebuilts/gradle/StorageProvider/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'StorageProviderSample'

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/MainActivity.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/MainActivity.java
deleted file mode 100644
index 61e70fc..0000000
--- a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/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.swiperefreshlayoutbasic;
-
-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();
-            SwipeRefreshLayoutBasicFragment fragment = new SwipeRefreshLayoutBasicFragment();
-            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/SwipeRefreshLayoutBasic/Application/tests/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 9455da6..0000000
--- a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.swiperefreshlayoutbasic.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.swiperefreshlayoutbasic"
-            android:label="Tests for com.example.android.swiperefreshlayoutbasic" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/build.gradle b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/SwipeRefreshLayoutBasic/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/dummydata/Cheeses.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/dummydata/Cheeses.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/MainActivity.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/MainActivity.java
new file mode 100644
index 0000000..8162d4a
--- /dev/null
+++ b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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.swiperefreshlayoutbasic;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        SwipeRefreshLayoutBasicFragment fragment = new SwipeRefreshLayoutBasicFragment();
+        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/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout/fragment_sample.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/layout/fragment_sample.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/layout/fragment_sample.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/menu/main.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/menu/main_menu.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/menu/main_menu.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/menu/main_menu.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/menu/main_menu.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/colors.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/colors.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/colors.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..0da53b7
--- /dev/null
+++ b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?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
+
+  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.swiperefreshlayoutbasic.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.swiperefreshlayoutbasic"
+            android:label="Tests for com.example.android.swiperefreshlayoutbasic" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/Application/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java b/prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshLayoutBasic/Application/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java
rename to prebuilts/gradle/SwipeRefreshLayoutBasic/SwipeRefreshLayoutBasicSample/tests/src/com/example/android/swiperefreshlayoutbasic/tests/SampleTests.java

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/SwipeRefreshLayoutBasic/gradle/wrapper/gradle-wrapper.properties
index a9085ca..f699501 100644
--- a/prebuilts/gradle/SwipeRefreshLayoutBasic/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/SwipeRefreshLayoutBasic/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip

diff --git a/prebuilts/gradle/SwipeRefreshLayoutBasic/settings.gradle b/prebuilts/gradle/SwipeRefreshLayoutBasic/settings.gradle
index 9464a35..3a38e28 100644
--- a/prebuilts/gradle/SwipeRefreshLayoutBasic/settings.gradle
+++ b/prebuilts/gradle/SwipeRefreshLayoutBasic/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'SwipeRefreshLayoutBasicSample'

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/MainActivity.java b/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/MainActivity.java
deleted file mode 100644
index ca3a5bf..0000000
--- a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/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.swiperefreshlistfragment;
-
-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();
-            SwipeRefreshListFragmentFragment fragment = new SwipeRefreshListFragmentFragment();
-            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/SwipeRefreshListFragment/Application/tests/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshListFragment/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 8326b36..0000000
--- a/prebuilts/gradle/SwipeRefreshListFragment/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.swiperefreshlistfragment.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.swiperefreshlistfragment"
-            android:label="Tests for com.example.android.swiperefreshlistfragment" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/build.gradle b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/SwipeRefreshListFragment/Application/libs/android-support-v4.jar b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/libs/android-support-v4.jar
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/libs/android-support-v4.jar
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/libs/android-support-v4.jar
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/dummydata/Cheeses.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/dummydata/Cheeses.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/MainActivity.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/MainActivity.java
new file mode 100644
index 0000000..6ebf85f
--- /dev/null
+++ b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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.swiperefreshlistfragment;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        SwipeRefreshListFragmentFragment fragment = new SwipeRefreshListFragmentFragment();
+        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/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragment.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/menu/main.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/menu/main_menu.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/menu/main_menu.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/menu/main_menu.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/menu/main_menu.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/colors.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/colors.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/colors.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/colors.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..a1f8f9b
--- /dev/null
+++ b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?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
+
+  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.swiperefreshlistfragment.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.swiperefreshlistfragment"
+            android:label="Tests for com.example.android.swiperefreshlistfragment" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/Application/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java b/prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshListFragment/Application/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java
rename to prebuilts/gradle/SwipeRefreshListFragment/SwipeRefreshListFragmentSample/tests/src/com/example/android/swiperefreshlistfragment/tests/SampleTests.java

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/SwipeRefreshListFragment/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/SwipeRefreshListFragment/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/SwipeRefreshListFragment/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/SwipeRefreshListFragment/settings.gradle b/prebuilts/gradle/SwipeRefreshListFragment/settings.gradle
index 9464a35..01af4e2 100644
--- a/prebuilts/gradle/SwipeRefreshListFragment/settings.gradle
+++ b/prebuilts/gradle/SwipeRefreshListFragment/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'SwipeRefreshListFragmentSample'

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/MainActivity.java b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/MainActivity.java
deleted file mode 100644
index a8bbf4d..0000000
--- a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/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.swiperefreshmultipleviews;
-
-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();
-            SwipeRefreshMultipleViewsFragment fragment = new SwipeRefreshMultipleViewsFragment();
-            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/SwipeRefreshMultipleViews/Application/tests/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/Application/tests/AndroidManifest.xml
deleted file mode 100644
index dea1d96..0000000
--- a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,59 +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.
--->
-
-
-
-<?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.swiperefreshmultipleviews.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.swiperefreshmultipleviews"
-            android:label="Tests for com.example.android.swiperefreshmultipleviews" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/build.gradle b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/SwipeRefreshMultipleViews/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/AndroidManifest.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/AndroidManifest.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/AndroidManifest.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/activities/SampleActivityBase.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/dummydata/Cheeses.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/dummydata/Cheeses.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/dummydata/Cheeses.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/view/SlidingTabLayout.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/view/SlidingTabLayout.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/common/view/SlidingTabStrip.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/common/view/SlidingTabStrip.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MainActivity.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MainActivity.java
new file mode 100644
index 0000000..0d708c9
--- /dev/null
+++ b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MainActivity.java

@@ -0,0 +1,107 @@
+/*
+* 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.swiperefreshmultipleviews;
+
+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);
+
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        SwipeRefreshMultipleViewsFragment fragment = new SwipeRefreshMultipleViewsFragment();
+        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/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/MultiSwipeRefreshLayout.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout-w720dp/activity_main.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout-w720dp/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout-w720dp/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout-w720dp/activity_main.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout/fragment_sample.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout/fragment_sample.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/layout/fragment_sample.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/layout/fragment_sample.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/menu/main.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/menu/main.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/menu/main.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/menu/main.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/menu/main_menu.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/menu/main_menu.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/menu/main_menu.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/menu/main_menu.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/color.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/color.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/color.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/color.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/fragmentview_strings.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/fragmentview_strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/fragmentview_strings.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/fragmentview_strings.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/strings.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/AndroidManifest.xml b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..8c9b277
--- /dev/null
+++ b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?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.
+-->
+
+
+
+<?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.swiperefreshmultipleviews.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.swiperefreshmultipleviews"
+            android:label="Tests for com.example.android.swiperefreshmultipleviews" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/Application/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java b/prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/SwipeRefreshMultipleViews/Application/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java
rename to prebuilts/gradle/SwipeRefreshMultipleViews/SwipeRefreshMultipleViewsSample/tests/src/com/example/android/swiperefreshmultipleviews/tests/SampleTests.java

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/SwipeRefreshMultipleViews/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/SwipeRefreshMultipleViews/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/SwipeRefreshMultipleViews/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/SwipeRefreshMultipleViews/settings.gradle b/prebuilts/gradle/SwipeRefreshMultipleViews/settings.gradle
index 9464a35..716f424 100644
--- a/prebuilts/gradle/SwipeRefreshMultipleViews/settings.gradle
+++ b/prebuilts/gradle/SwipeRefreshMultipleViews/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'SwipeRefreshMultipleViewsSample'

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/activities/SampleActivityBase.java
deleted file mode 100644
index 3228927..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/Log.java
deleted file mode 100644
index 17503c5..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogFragment.java
deleted file mode 100644
index b302acd..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogNode.java
deleted file mode 100644
index bc37cab..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogView.java
deleted file mode 100644
index c01542b..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
deleted file mode 100644
index 16a9e7b..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
deleted file mode 100644
index 19967dc..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index b1efaf4..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
deleted file mode 100644
index 1358628..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-hdpi/tile.9.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index f5f9244..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 5d07b3f..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 6ef21e1..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/menu/main.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/menu/main.xml
deleted file mode 100644
index 165c0a8..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/menu/main.xml
+++ /dev/null

@@ -1,30 +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/btn_phone_only"
-          android:showAsAction="always"
-          android:title="@string/phone_only" />
-
-    <item android:id="@+id/btn_wear_only"
-          android:showAsAction="always"
-          android:title="@string/wear_only" />
-
-    <item android:id="@+id/btn_different"
-          android:showAsAction="always"
-          android:title="@string/different_notifications" />
-
-</menu>

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-sw600dp/template-dimens.xml
deleted file mode 100644
index 22074a2..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-sw600dp/template-styles.xml
deleted file mode 100644
index 03d1974..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values-v11/template-styles.xml
deleted file mode 100644
index 8c1ea66..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/base-strings.xml
deleted file mode 100644
index 8b6d8ff..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/base-strings.xml
+++ /dev/null

@@ -1,29 +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">SynchronizedNotifications</string>
-    <string name="intro_message">
-        <![CDATA[
-        
-            
-            This sample creates simple or synchronized notifications on a
-            device and an Android Wear watch.
-            
-        
-        ]]>
-    </string>
-</resources>

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/dimens.xml
deleted file mode 100644
index a1e9cfe..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/res/values/sample-strings.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/sample-strings.xml
deleted file mode 100644
index 8ac6bf2..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/sample-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="wear_only">Watch Only</string>
-    <string name="phone_only">Phone Only</string>
-    <string name="different_notifications">Both</string>
-    <string name="phone_both">Phone Notification</string>
-    <string name="watch_both">Watch Notification</string>
-
-</resources>

diff --git a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/template-dimens.xml
deleted file mode 100644
index 39e710b..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/template-styles.xml
deleted file mode 100644
index cfffcbd..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Application/src/main/res/values/template-styles.xml
+++ /dev/null

@@ -1,54 +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" />
-
-    <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">
-        <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>
-
-
-    <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/SynchronizedNotifications/CONTRIB.md b/prebuilts/gradle/SynchronizedNotifications/CONTRIB.md
deleted file mode 100644
index 14a4fcf..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/LICENSE b/prebuilts/gradle/SynchronizedNotifications/LICENSE
deleted file mode 100644
index 1af981f..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/Shared/src/main/res/values/strings.xml b/prebuilts/gradle/SynchronizedNotifications/Shared/src/main/res/values/strings.xml
deleted file mode 100644
index 0f2bb90..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Shared/src/main/res/values/strings.xml
+++ /dev/null

@@ -1,18 +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">Shared</string>
-</resources>

diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index f7dd9a0..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index fef2da7..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index f2fb03c..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/layout/activity_wearable.xml b/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/layout/activity_wearable.xml
deleted file mode 100644
index 71451ff..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/Wearable/src/main/res/layout/activity_wearable.xml
+++ /dev/null

@@ -1,23 +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">
-
-</RelativeLayout>

diff --git a/prebuilts/gradle/SynchronizedNotifications/build.gradle b/prebuilts/gradle/SynchronizedNotifications/build.gradle
deleted file mode 100644
index 5cf5d3d..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/build.gradle
+++ /dev/null

@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-

diff --git a/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.jar b/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 8c0fb64..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.jar
+++ /dev/null
Binary files differ

diff --git a/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index d7f03cf..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-#Wed Apr 10 15:27:10 PDT 2013
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip

diff --git a/prebuilts/gradle/SynchronizedNotifications/gradlew b/prebuilts/gradle/SynchronizedNotifications/gradlew
deleted file mode 100755
index 91a7e26..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/gradlew
+++ /dev/null

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

diff --git a/prebuilts/gradle/SynchronizedNotifications/gradlew.bat b/prebuilts/gradle/SynchronizedNotifications/gradlew.bat
deleted file mode 100644
index 8a0b282..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/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/SynchronizedNotifications/settings.gradle b/prebuilts/gradle/SynchronizedNotifications/settings.gradle
deleted file mode 100644
index 8522c57..0000000
--- a/prebuilts/gradle/SynchronizedNotifications/settings.gradle
+++ /dev/null

@@ -1 +0,0 @@
-include ':Application', ':Wearable', ':Shared'

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/TextLinkify/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index eb55f20..0000000
--- a/prebuilts/gradle/TextLinkify/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,42 +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.
--->
-
-
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.textlinkify"
-    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=".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/TextLinkify/Application/tests/AndroidManifest.xml b/prebuilts/gradle/TextLinkify/Application/tests/AndroidManifest.xml
deleted file mode 100644
index 9a4dd16..0000000
--- a/prebuilts/gradle/TextLinkify/Application/tests/AndroidManifest.xml
+++ /dev/null

@@ -1,40 +0,0 @@
-<?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.textlinkify.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.textlinkify"
-            android:label="Tests for com.example.android.textlinkify" />
-
-</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/build.gradle b/prebuilts/gradle/TextLinkify/TextLinkifySample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/TextLinkify/TextLinkifySample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/TextLinkify/TextLinkifySample/src/main/AndroidManifest.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..49b4eae
--- /dev/null
+++ b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/AndroidManifest.xml

@@ -0,0 +1,44 @@
+<?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.textlinkify"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <uses-sdk
+        android:minSdkVersion="4"
+        android:targetSdkVersion="17" />
+
+    <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>
+    </application>
+
+</manifest>

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/textlinkify/MainActivity.java b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/textlinkify/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/java/com/example/android/textlinkify/MainActivity.java
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/java/com/example/android/textlinkify/MainActivity.java

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-sw720dp-land/dimens.xml

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/values/strings.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/values/styles.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/styles.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/values/styles.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/styles.xml

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/TextLinkify/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml b/prebuilts/gradle/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml
new file mode 100644
index 0000000..e368f05
--- /dev/null
+++ b/prebuilts/gradle/TextLinkify/TextLinkifySample/tests/AndroidManifest.xml

@@ -0,0 +1,42 @@
+<?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.textlinkify.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="19" />
+
+    <!-- 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.textlinkify"
+            android:label="Tests for com.example.android.textlinkify" />
+
+</manifest>
\ No newline at end of file

diff --git a/prebuilts/gradle/TextLinkify/Application/tests/src/com/example/android/textlinkify/tests/SampleTests.java b/prebuilts/gradle/TextLinkify/TextLinkifySample/tests/src/com/example/android/textlinkify/tests/SampleTests.java
similarity index 100%
rename from prebuilts/gradle/TextLinkify/Application/tests/src/com/example/android/textlinkify/tests/SampleTests.java
rename to prebuilts/gradle/TextLinkify/TextLinkifySample/tests/src/com/example/android/textlinkify/tests/SampleTests.java

diff --git a/prebuilts/gradle/TextLinkify/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/TextLinkify/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/TextLinkify/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/TextLinkify/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/TextLinkify/settings.gradle b/prebuilts/gradle/TextLinkify/settings.gradle
index 9464a35..38e7ddd 100644
--- a/prebuilts/gradle/TextLinkify/settings.gradle
+++ b/prebuilts/gradle/TextLinkify/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'TextLinkifySample'

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/AndroidManifest.xml b/prebuilts/gradle/TextSwitcher/Application/src/main/AndroidManifest.xml
deleted file mode 100644
index 70884cd..0000000
--- a/prebuilts/gradle/TextSwitcher/Application/src/main/AndroidManifest.xml
+++ /dev/null

@@ -1,41 +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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.textswitcher"
-    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=".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/TextSwitcher/TextSwitcherSample/build.gradle b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/build.gradle
new file mode 100644
index 0000000..07e3848
--- /dev/null
+++ b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/build.gradle

@@ -0,0 +1,59 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.11.+'
+    }
+}
+
+apply plugin: 'android'
+
+
+dependencies {
+
+
+
+}
+
+// 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 19
+
+    buildToolsVersion "20"
+
+    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/TextSwitcher/TextSwitcherSample/src/main/AndroidManifest.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..7f512a3
--- /dev/null
+++ b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/AndroidManifest.xml

@@ -0,0 +1,43 @@
+<?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.textswitcher"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="4"
+        android:targetSdkVersion="17" />
+
+    <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>
+    </application>
+
+</manifest>

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/Log.java b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/Log.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/Log.java
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/Log.java

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogFragment.java b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogFragment.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogFragment.java
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogFragment.java

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogNode.java b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogNode.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogNode.java
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogNode.java

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogView.java b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogView.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogView.java
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogView.java

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogWrapper.java b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogWrapper.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/LogWrapper.java
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/LogWrapper.java

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/common/logger/MessageOnlyLogFilter.java

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/textswitcher/MainActivity.java b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/textswitcher/MainActivity.java
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/java/com/example/android/textswitcher/MainActivity.java
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/java/com/example/android/textswitcher/MainActivity.java

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-hdpi/ic_launcher.png b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-hdpi/ic_launcher.png
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-hdpi/tile.9.png b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-hdpi/tile.9.png
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-hdpi/tile.9.png
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-hdpi/tile.9.png
Binary files differ

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-mdpi/ic_launcher.png b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-mdpi/ic_launcher.png
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-xhdpi/ic_launcher.png b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-xhdpi/ic_launcher.png
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-xxhdpi/ic_launcher.png b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/drawable-xxhdpi/ic_launcher.png
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/layout/activity_main.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/layout/activity_main.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/layout/activity_main.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/layout/activity_main.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/layout/sample_main.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/layout/sample_main.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/layout/sample_main.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/layout/sample_main.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/dimens.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/dimens.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/dimens.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/template-dimens.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/template-dimens.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/template-dimens.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/template-styles.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw600dp/template-styles.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw600dp/template-styles.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw720dp-land/dimens.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw720dp-land/dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values-sw720dp-land/dimens.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-sw720dp-land/dimens.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v11/styles.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v11/styles.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v11/styles.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v11/styles.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v11/template-styles.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v11/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v11/template-styles.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v11/template-styles.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v14/styles.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v14/styles.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values-v14/styles.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values-v14/styles.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values/base-strings.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/base-strings.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values/base-strings.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/base-strings.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values/dimens.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values/dimens.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/dimens.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values/strings.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/strings.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values/strings.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/strings.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values/template-dimens.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/template-dimens.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values/template-dimens.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/template-dimens.xml

diff --git a/prebuilts/gradle/TextSwitcher/Application/src/main/res/values/template-styles.xml b/prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/template-styles.xml
similarity index 100%
rename from prebuilts/gradle/TextSwitcher/Application/src/main/res/values/template-styles.xml
rename to prebuilts/gradle/TextSwitcher/TextSwitcherSample/src/main/res/values/template-styles.xml

diff --git a/prebuilts/gradle/TextSwitcher/gradle/wrapper/gradle-wrapper.properties b/prebuilts/gradle/TextSwitcher/gradle/wrapper/gradle-wrapper.properties
index d7f03cf..56f685a 100644
--- a/prebuilts/gradle/TextSwitcher/gradle/wrapper/gradle-wrapper.properties
+++ b/prebuilts/gradle/TextSwitcher/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

diff --git a/prebuilts/gradle/TextSwitcher/settings.gradle b/prebuilts/gradle/TextSwitcher/settings.gradle
index 9464a35..6740a95 100644
--- a/prebuilts/gradle/TextSwitcher/settings.gradle
+++ b/prebuilts/gradle/TextSwitcher/settings.gradle

@@ -1 +1,4 @@
-include 'Application'
+
+
+
+include 'TextSwitcherSample'