diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:31:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:31:12 +0000 |
| commit | e7575570d3fa62be5b789e4106901dc3bc26d1c6 (patch) | |
| tree | a9fc73af3653bb3c5db78ef929feee32acef5592 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5e73ac027d795c0442c841e6081fc6f43c8d7390 (diff) | |
| parent | ebaecc0c85523c65adb1517f48ce53b4f8576a64 (diff) | |
am ebaecc0c: (-s ours) am cc9b8ddd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'ebaecc0c85523c65adb1517f48ce53b4f8576a64':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions