diff options
author | Bill Yi <byi@google.com> | 2018-08-04 07:37:56 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-04 07:37:56 -0700 |
commit | 248a23d07b0453bf1c70f1e32dc3129b201c2585 (patch) | |
tree | 1fd6d7d0bd41b2cb0d90d6c63626a6bcfb07e7d5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 6ac84df7774c16219fb478953814ce3b9068d231 (diff) | |
parent | 6a86673c4114882fc8ac329dfea0729d9f7e7a19 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 6a86673c41 -s ours
Change-Id: I3479cdef58329701a6df8dbefa05b93d6e48798d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions