summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-26 14:28:02 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-26 14:28:02 -0700
commit40dec9c738dbe4d4d4afe01828d06b340afa8874 (patch)
tree41c9ef0dafd129f74282f3852bc05fd93f09286a /libs
parentecb109d165075573b2084e4b95ed16302d5e4f73 (diff)
parent5da30b73d4e514f7714b2e72a902f5b1ce13c361 (diff)
downloadframeworks_base-40dec9c738dbe4d4d4afe01828d06b340afa8874.zip
frameworks_base-40dec9c738dbe4d4d4afe01828d06b340afa8874.tar.gz
frameworks_base-40dec9c738dbe4d4d4afe01828d06b340afa8874.tar.bz2
Merge change 2466
* changes: Rename Calc sample to Fountain.
Diffstat (limited to 'libs')
-rw-r--r--libs/rs/java/Fountain/Android.mk (renamed from libs/rs/java/Calc/Android.mk)0
-rw-r--r--libs/rs/java/Fountain/AndroidManifest.xml (renamed from libs/rs/java/Calc/AndroidManifest.xml)0
-rw-r--r--libs/rs/java/Fountain/src/com/android/fountain/Fountain.java (renamed from libs/rs/java/Calc/src/com/android/calc/Calc.java)0
-rw-r--r--libs/rs/java/Fountain/src/com/android/fountain/FountainView.java (renamed from libs/rs/java/Calc/src/com/android/calc/CalcView.java)0
-rw-r--r--libs/rs/java/Fountain/src/com/android/fountain/RSSurfaceView.java (renamed from libs/rs/java/Calc/src/com/android/calc/RSSurfaceView.java)0
-rw-r--r--libs/rs/java/Fountain/src/com/android/fountain/RenderScript.java (renamed from libs/rs/java/Calc/src/com/android/calc/RenderScript.java)0
6 files changed, 0 insertions, 0 deletions
diff --git a/libs/rs/java/Calc/Android.mk b/libs/rs/java/Fountain/Android.mk
index 179009f..179009f 100644
--- a/libs/rs/java/Calc/Android.mk
+++ b/libs/rs/java/Fountain/Android.mk
diff --git a/libs/rs/java/Calc/AndroidManifest.xml b/libs/rs/java/Fountain/AndroidManifest.xml
index 8eee0663..8eee0663 100644
--- a/libs/rs/java/Calc/AndroidManifest.xml
+++ b/libs/rs/java/Fountain/AndroidManifest.xml
diff --git a/libs/rs/java/Calc/src/com/android/calc/Calc.java b/libs/rs/java/Fountain/src/com/android/fountain/Fountain.java
index 94fdb8e..94fdb8e 100644
--- a/libs/rs/java/Calc/src/com/android/calc/Calc.java
+++ b/libs/rs/java/Fountain/src/com/android/fountain/Fountain.java
diff --git a/libs/rs/java/Calc/src/com/android/calc/CalcView.java b/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java
index ecde910..ecde910 100644
--- a/libs/rs/java/Calc/src/com/android/calc/CalcView.java
+++ b/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java
diff --git a/libs/rs/java/Calc/src/com/android/calc/RSSurfaceView.java b/libs/rs/java/Fountain/src/com/android/fountain/RSSurfaceView.java
index d18270a..d18270a 100644
--- a/libs/rs/java/Calc/src/com/android/calc/RSSurfaceView.java
+++ b/libs/rs/java/Fountain/src/com/android/fountain/RSSurfaceView.java
diff --git a/libs/rs/java/Calc/src/com/android/calc/RenderScript.java b/libs/rs/java/Fountain/src/com/android/fountain/RenderScript.java
index bab9666..bab9666 100644
--- a/libs/rs/java/Calc/src/com/android/calc/RenderScript.java
+++ b/libs/rs/java/Fountain/src/com/android/fountain/RenderScript.java