diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-06 13:10:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-06 13:10:38 +0000 |
| commit | 847b1d7cba1da16b0555c420752e68f05e25f9db (patch) | |
| tree | 0abc5148688c156d4bf6b39e161f72b1d18ee326 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8d592fae4e2bbd7e1eb940dbf8d37b91c54a6a2c (diff) | |
| parent | 80b4e4de4cc28eb87c746b9565be91a369c2d704 (diff) | |
[automerger skipped] Merge "Parent: cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author: Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit: Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" am: 830c70ad25 am: ff642c408c -s ours am: 80b4e4de4c -s ours
am skip reason: Change-Id I4b3affce57ba61ad9697e91f2a5f63556ee1cd62 with SHA-1 5b0078defd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374724
Change-Id: I8acc81352a181881aee5527503c74bfa4a14996d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions