diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-15 22:45:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 22:45:37 +0000 |
| commit | 80e9c04e910f88283f34dddac36f32db291e9c63 (patch) | |
| tree | a4a82ef6ad1d4f9642c396b346b156449805dfcf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 69032a7a237f58a4b7f8f273cbce8cd25285b84b (diff) | |
| parent | f48b416e9806f374f95cfcfc35b60db82bb272a8 (diff) | |
am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'f48b416e9806f374f95cfcfc35b60db82bb272a8':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions