diff options
author | Bill Yi <byi@google.com> | 2019-08-09 13:13:35 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-09 13:13:35 -0700 |
commit | e62a7cc395a4ea1230c3318e9c22e030130867f7 (patch) | |
tree | 611357840efa164aabd1e50e75413a9767a868b5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ced64357f8814ad8585ace04f8e9f5e63cdd3d16 (diff) | |
parent | 43dcada4361d55b3f1ee057e9588f154b2eba154 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours am: 5c0d577dea -s ours am: d230d40f3b -s ours
am: 43dcada436 -s ours
am skip reason: subject contains skip directive
Change-Id: I40f54967d7f83b69483fd4c37c2012dc2d744235
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions