diff options
author | Bill Yi <byi@google.com> | 2019-08-06 23:27:09 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-06 23:27:09 -0700 |
commit | 8bfcd733fe08a98f6011d8fe09ce87530e1cf938 (patch) | |
tree | a6521e77b7aef19ef3a6be5d4704d3eedfea42c0 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | bdb2f1c3be21d745984facf4b076d929ae5be7e5 (diff) | |
parent | 515271697bd28acb8bebc2b4596b82060192f592 (diff) |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours am: 21fd281430 -s ours
am: 515271697b -s ours
am skip reason: subject contains skip directive
Change-Id: I51f65aed52f0eea954249ec3836babe93cfff913
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions