diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-22 14:19:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-22 14:19:05 +0000 |
| commit | 5cae0cded77f412d738bfdc2e58036c8e9422135 (patch) | |
| tree | 8a9b9526a498f0170bfe70986bf3e4e524ba46df /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 069bf3c2a41a0c97b31602309965f28293b59200 (diff) | |
| parent | a88427c34729368766593fc2a8864b5383e907cc (diff) | |
am a88427c3: (-s ours) am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'a88427c34729368766593fc2a8864b5383e907cc':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions