diff options
author | Bill Yi <byi@google.com> | 2019-04-07 17:50:31 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-07 17:50:31 -0700 |
commit | e9af9acf792c778ecdeb7502cc59910cfee479e7 (patch) | |
tree | 0636f32879f232aefbd12838bb5ab4ab04a0bb86 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8b1112c589e74556a91e89084dec4b3047b50a70 (diff) | |
parent | 835f260d602a319e6670911ff3887f5c6247b33d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 835f260d60 -s ours
am skip reason: subject contains skip directive
Change-Id: I7198df57477c246db6ad226f2ca7c0b54a15e6f5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions