diff options
author | Bill Yi <byi@google.com> | 2019-09-25 15:36:08 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 15:36:08 -0700 |
commit | e4739cd8a23b0ae5e8ed49904a077686fc8deba2 (patch) | |
tree | bb071a27bd8fe960ffb558097396ba4cd783ab50 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 115ebd8757e46e668c38bf1990d8479f7602c2fb (diff) | |
parent | 1da3106efe52e8ab1a3b1733689e33cd4e48e063 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: eadfdeb249 -s ours am: 254132b362 -s ours
am: 1da3106efe -s ours
am skip reason: subject contains skip directive
Change-Id: If41a15026e5a343049aade9a006a95c53d2d17aa
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions