diff options
| author | Eric Fischer <enf@google.com> | 2011-05-10 14:23:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-10 14:23:46 -0700 |
| commit | 98041f02b471b100056c3dc16e50f04a059f9a58 (patch) | |
| tree | a5cce64bb772f30cf464cb45f4aef7aaf767cb83 /graphics/java/android/renderscript/RenderScript.java | |
| parent | affca8fa11aa731cdc8b4b4f2b5478f182b9fbbf (diff) | |
| parent | 270fbfede58e4971588755adfa7e70e0de07b8cf (diff) | |
am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '270fbfede58e4971588755adfa7e70e0de07b8cf':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions