diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:23:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:23:44 +0000 |
| commit | 18f07fd061e33310354217b33fa83abc0e94ce57 (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 536351ebbd2b02255649d2b801f884e3b4ed1e64 (diff) | |
| parent | 7d627e9cf08e2f827ca6de619a728fecce57c6ff (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 52edfafb9c -s ours
am: 7d627e9cf0 -s ours
* commit '7d627e9cf08e2f827ca6de619a728fecce57c6ff':
Import translations. DO NOT MERGE
Change-Id: I75a2eb02c5ea1f26186f65a524942e2227908099
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions