diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-13 00:31:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-13 00:31:25 +0000 |
| commit | be255041dbcd2a86f06b7e234e9c9aff7ef27e5c (patch) | |
| tree | 43d2daf76515b84b70c4d096abe634f44346c906 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dc333b58c10ef943a7d871ce46981a8a64f800d5 (diff) | |
| parent | b4a626361020474c9e568133c42a5c6cb6b8e91e (diff) | |
[automerger skipped] Merge "Revert "NetworkRequest: Embed requestor uid & packageName"" am: 617b4b00e3 am: 438129f4aa am: b4a6263610 -s ours
am skip reason: skipped by user rpius
Change-Id: I32f14eb9d9157a2e139b239d091c80b710b29e57
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions