diff options
author | Bill Yi <byi@google.com> | 2019-09-25 21:50:14 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 21:50:14 -0700 |
commit | af21a476ea9b48ec9fb0de14a394f79dbb313da5 (patch) | |
tree | 0cb4de1e51ab0831b5df5f427cb083b05f112412 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a8a40a5109ef42959ab4c19f5523eb2b0b3a8bb2 (diff) | |
parent | b1547258b70d5f323b84c2ea394e22cb1e0c4c72 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0bc8e73ec9 -s ours
am: b1547258b7 -s ours
am skip reason: subject contains skip directive
Change-Id: I3f14fb3d9653d3686c34305217342d67eb3cd273
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions