diff options
| author | Patrick Baumann <patb@google.com> | 2020-08-29 02:08:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-29 02:08:00 +0000 |
| commit | 979db2c120a55a520ad4d386a61ae4c3281c2aeb (patch) | |
| tree | bf95ac7ba1ca3da71f42e896bfd738c59fdaf6bf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 951d16b75377adae0c17cb65c243694303279e05 (diff) | |
| parent | c1874ee2826091f107bdeca9920cca339c57ad14 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE am: 929ab61a14 -s ours am: 15a769dbc3 -s ours am: 20171d27de am: c1874ee282 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11230862
Change-Id: Ice76dfed171ab6d9f04c86f9b5c38ef3e4ff9363
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions