diff options
| author | Baligh Uddin <baligh@google.com> | 2013-12-26 23:44:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-26 23:44:18 +0000 |
| commit | 5cf8dc8ea5b364802f9e986ddb7f4e21652145be (patch) | |
| tree | aa67c293d11ea696c3d73990507494267f01cbb7 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 28e21fb425aad90d4c76dcc618caf1cb5f0cf7ed (diff) | |
| parent | ca7a1442d0f633b663e59813957e98ef68c5f99e (diff) | |
am ca7a1442: (-s ours) am a95f6e3a: (-s ours) am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ca7a1442d0f633b663e59813957e98ef68c5f99e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions