| commit | 06e33a0edc416c73e7067095060b619c5a4ad057 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Jul 24 03:57:09 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 24 03:57:09 2013 +0000 |
| tree | f0d7a0aa5a216ef5d58bebce9c44eaa374bbba27 | |
| parent | 0d630f36424e8a2f0d3fda4d54132fccab9225cc [diff] | |
| parent | 164d0bb31515615572c50fb3c4e1309d9ca125e0 [diff] |
Merge "Update README for common directory to be more user friendly" into jb-mr2-dev
diff --git a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/common b/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/common deleted file mode 120000 index f98e04d..0000000 --- a/connectivity/BasicSyncAdapter/BasicSyncAdapter/src/main/java/com/example/android/common +++ /dev/null
@@ -1 +0,0 @@ -../../../../../../../../../../common \ No newline at end of file
diff --git a/security/keystore/gradle/wrapper/gradle-wrapper.jar b/security/keystore/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from security/keystore/gradle/wrapper/gradle-wrapper.jar rename to security/keystore/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.jar Binary files differ
diff --git a/security/keystore/gradle/wrapper/gradle-wrapper.properties b/security/keystore/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from security/keystore/gradle/wrapper/gradle-wrapper.properties rename to security/keystore/BasicAndroidKeyStore/gradle/wrapper/gradle-wrapper.properties
diff --git a/security/keystore/gradlew b/security/keystore/BasicAndroidKeyStore/gradlew similarity index 100% rename from security/keystore/gradlew rename to security/keystore/BasicAndroidKeyStore/gradlew
diff --git a/security/keystore/gradlew.bat b/security/keystore/BasicAndroidKeyStore/gradlew.bat similarity index 100% rename from security/keystore/gradlew.bat rename to security/keystore/BasicAndroidKeyStore/gradlew.bat
diff --git a/ui/views/HorizontalPaging/settings.gradle b/ui/views/HorizontalPaging/settings.gradle new file mode 100644 index 0000000..892a596 --- /dev/null +++ b/ui/views/HorizontalPaging/settings.gradle
@@ -0,0 +1 @@ +include ':HorizontalPaging'