diff options
| author | Costin Manolache <costin@google.com> | 2010-05-12 19:06:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 19:06:39 -0700 |
| commit | fa2e3dcd855f573e160dbf258fd60a172b6e3f02 (patch) | |
| tree | 14b6fbcc9105367a3ccbb876042b3b6e032b1207 /graphics/java/android/renderscript/RenderScriptGL.java | |
| parent | c99c401d93f94d4243ed8cdd5fec101efc9ee265 (diff) | |
| parent | 8ea9f130d24a7dd1e505ba0cf437bdd8a660975e (diff) | |
am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp
* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
Bug 2680071: Rename the Cloud to Device
Diffstat (limited to 'graphics/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions