diff options
| author | Bill Yi <byi@google.com> | 2017-07-26 23:12:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 23:12:50 +0000 |
| commit | 6e654dca2a3113566f0b8e9669be441709fb15ef (patch) | |
| tree | 5fc5c0162de61a75cfa25a725bde577202d6dbec /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13b2531ea40b61c5650a18b184ce65e9df68d822 (diff) | |
| parent | cd10d78d0804f69a33beaa981768fe45514dd702 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE am: 495d4ce1b9 -s ours am: 120c3e9874 -s ours" into oc-dr1-dev am: 70906280eb -s ours" into oc-dr1-dev-plus-aosp
am: cd10d78d08 -s ours
Change-Id: I500525867eb8081f23e650e8e24a321dc7171716
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions