diff options
| author | Bill Yi <byi@google.com> | 2019-05-09 12:06:53 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-09 12:06:53 -0700 |
| commit | 1725eea139c73a8eb736d15d352ec17b009d8d57 (patch) | |
| tree | a7ad0b81e2014e7a287ac28171d2014940305e7c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6fcdd823d4dc1ab05467df84c11e91e97ef1a268 (diff) | |
| parent | d1c478540a43e079cc5a39642e74bf351323afa9 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d1c478540a -s ours
am skip reason: subject contains skip directive
Change-Id: I305f8ae441fc1161b9e82eb09252befb8bd439ed
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions