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