diff options
| author | Bill Yi <byi@google.com> | 2019-07-31 14:16:12 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-31 14:16:12 -0700 |
| commit | 1f8702c05bf04a1ae144632d98ebd6e85063c7da (patch) | |
| tree | 0b44fb27bb74fe3a76c9b85a43d28b53d0d24c15 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b3d6b9ea1344f00a55c20b22c77de34ccd18e7a3 (diff) | |
| parent | df181a429f3c0fcc7c0d6eae2deada5e1a1eab74 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: df181a429f -s ours
am skip reason: subject contains skip directive
Change-Id: I676d2cf1df3b2752c82e342b12bb3a1c55e063cc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions