diff options
| author | Bill Yi <byi@google.com> | 2017-07-26 23:43:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 23:43:39 +0000 |
| commit | 1a19cb4e1060a157d9791ccd5d078bde23c393a6 (patch) | |
| tree | 70ce4720e97a45cbbb435e06cd5ffa4705d0b6a1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e0a07a210d3f7e065739153cf094f7af018e565a (diff) | |
| parent | ab60d6b44e1f4df22e324dd194dc9e1e8aca2513 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde91384 -s ours am: cccb304acf -s ours" into oc-dr1-dev
am: ab60d6b44e -s ours
Change-Id: Ibce37f648f7dca60466e8c64c928f141dd640932
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions