diff options
| author | Roshan Pius <rpius@google.com> | 2021-01-15 13:57:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-15 13:57:26 +0000 |
| commit | 3f664d9a9d6a9b40159c20f28f86c9cff431caf7 (patch) | |
| tree | 90d47c1cd7d954ea4fb46dce268e4623e6d27f3f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ed05db93fa90a3d1f0adcee88fbe2300105a6f24 (diff) | |
| parent | 0ffd0b025a6828b693d9a9c93027bfe55dd08be8 (diff) | |
[automerger skipped] Merge "NetworkCapabilities: Embed location senstive TransportInfo" am: d3ee5559ed am: 8244f5ea81 am: 0ffd0b025a -s ours
am skip reason: Change-Id Ie522d8c75a82ae521ccfd5165823d0c72642e651 with SHA-1 e9261ea9d6 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508602
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7ace3cc9124b36ddc62306373442d724c3682d8
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions