diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 01:12:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 01:12:33 +0000 |
| commit | 172a22ab36c54300f1b08d1269e319202d235411 (patch) | |
| tree | 3ba3cf0b84e19e154c7e33761fb44094af864355 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cb2a5ff224b5fe703c1280b49df13fc3f4147ab9 (diff) | |
| parent | b46f697651406b1879d6083c68d0e4e93140daad (diff) | |
Merge "[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 -s ours am: eebb20887b -s ours" into rvc-d1-dev-plus-aosp am: d092b8c511 -s ours am: b46f697651 -s ours
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 2a8e461cab is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: I68960698fe47f926ff730a3a909b34a03abf45f4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions