diff options
| author | Bill Yi <byi@google.com> | 2019-05-22 06:27:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 06:27:41 -0700 |
| commit | 644914e28ea68f4b391bdf4fa303dbb56aa6ed97 (patch) | |
| tree | 6b003e29fab65a82d119f995753c8fec467cf0cb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dfb5a18f777a0772e5d638488ccfb8a57adf4d2d (diff) | |
| parent | 2744618843e11ce035aebad3c30253fac5a637dd (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b5c190fdb1 -s ours am: 89dcbd9a80 -s ours
am: 2744618843 -s ours
am skip reason: subject contains skip directive
Change-Id: I3d3fdd2976fa426033721eb4efd0202ff4fd286b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions