diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-05 05:03:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-05 05:03:21 +0000 |
| commit | 547c982b975f4e4d3a3f075602ef67544b8c7e26 (patch) | |
| tree | 2fb21f6033aa5ba8a9142b6c361cffde363ef254 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6035378f919908515c9c9c23cef1acc328779532 (diff) | |
| parent | 41dd05fdfb0d88f9bdf2bab649c8e65e3928c434 (diff) | |
Merge "Fix CaptivePortalTest before R" am: 41dd05fdfb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29443e1af761cca33185638e5bd84771e0bc9192
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions