diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-13 14:04:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-13 14:04:34 +0000 |
| commit | 1b6a8f87403703d9e8ded269208adcb5eb00c5db (patch) | |
| tree | 8c4d5700f85fba1cb1108c1bb2d321864e69811b /libs/hwui/pipeline/skia/GLFunctorDrawable.cpp | |
| parent | 9a6923b274f702644282e2d296d7d9d726d0ff4f (diff) | |
| parent | f8df6534c953110a84946a2a1adfe9c69761ab10 (diff) | |
Merge "[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: e6317e5caa -s ours am: 40f9b161e8 -s ours am: df647b5aa2 -s ours" into rvc-qpr-dev-plus-aosp am: f8df6534c9 -s ours
am skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 e6317e5caa is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906
Change-Id: Iecfde7015fb67a4066697e95b80d70c71a09d177
Diffstat (limited to 'libs/hwui/pipeline/skia/GLFunctorDrawable.cpp')
0 files changed, 0 insertions, 0 deletions