diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-03-12 00:26:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-12 00:26:49 +0000 |
| commit | 1764ceaa6761c978bf720185e301aad8d09ac0ac (patch) | |
| tree | f633d328610ca589117ccb603771f5a0da146705 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 734c56f7a965eefe9b7b39ab585a8d2656cb9615 (diff) | |
| parent | 2943678b0eae4b54a3f29544ff1b53c3d293f6fc (diff) | |
Merge changes from topic "ethernet_specifier" am: c77293b7a9 am: 2943678b0e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I772ca29f64cb9431a899a2c213c511ad467fc36f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions