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