diff options
author | Bill Yi <byi@google.com> | 2019-09-25 07:38:49 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 07:38:49 -0700 |
commit | 95579cbb622bec482c219d9c11967764b61928f3 (patch) | |
tree | 401fe6ad8d141161a80b11ba7a4debc46c19c98a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 7d867c29238c53886513abe93f70cdd8976c113f (diff) | |
parent | 8d0be7681834318c0f04d90f7dcd9dc72b40473f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf1720a620 -s ours
am: 8d0be76818 -s ours
am skip reason: subject contains skip directive
Change-Id: I27726ee2b43fc817465ebd148bbc5519cfa64298
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions