diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 01:12:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 01:12:52 +0000 |
| commit | 40394944942cd3ac0e061d1e6138dac9122e5370 (patch) | |
| tree | 3ba3cf0b84e19e154c7e33761fb44094af864355 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 172a22ab36c54300f1b08d1269e319202d235411 (diff) | |
| parent | c8da9c5b4409baeaa610bdf879bee7a88b09c9f9 (diff) | |
Merge "[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 am: 8143dc878d am: 5366502fa9 -s ours" into rvc-qpr-dev-plus-aosp am: c8da9c5b44 -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: I44bb4aadf5ed07968317ddcfa93d52063acd2a6a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions