diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-13 15:42:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 15:42:42 +0000 |
| commit | 4ee4c516be6b4d6744f10bd45e5ad4c641f987f6 (patch) | |
| tree | 8c0a94d8a885ad9b7b94e415564beaab6cfe0af3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 11e0ffdcc632ef1fbb23cbfcb4aea5f8aefec871 (diff) | |
| parent | 718928a1c1c9fa809c6244a7ff2442eed43d3d0c (diff) | |
am 718928a1: (-s ours) am 2c93fcac: (-s ours) am efa098a7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '718928a1c1c9fa809c6244a7ff2442eed43d3d0c':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions