diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-05 16:28:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-05 16:28:59 +0000 |
| commit | c0d2e7a6fb294fcf27039ea0157fbbde17a9b1a1 (patch) | |
| tree | 3dbb50972a58839d556a1a39022c2170e8e13632 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 28739294c1020bde477a44bd42575d8c640ddc18 (diff) | |
| parent | e229337b34a92f99ed25f92479753e9dfd113a96 (diff) | |
am e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'e229337b34a92f99ed25f92479753e9dfd113a96':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions