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