diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 01:01:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 01:01:23 +0000 |
| commit | b46f697651406b1879d6083c68d0e4e93140daad (patch) | |
| tree | b78579c9182e35089b6f4d78411641426375f412 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e4a30aa25d01caec8189a8c42cf5626c585c1ce5 (diff) | |
| parent | d092b8c5110f1c04aa3544308d13acfd54c44d58 (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 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: I6d5340d966b851683223fc38049c9bdcfa60d3e1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions