diff options
| author | Patrick Baumann <patb@google.com> | 2020-10-01 20:21:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-01 20:21:15 +0000 |
| commit | 31f5f6908fcd0af7ffcae195af8c250e1c5c0d81 (patch) | |
| tree | 7372d0fcf96afda1d7142e7942dd724ad319f704 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1735c59a61fc865891f8a01f01d0f32b9ff41482 (diff) | |
| parent | 842782158b431005102c8488c4681c4917d968bc (diff) | |
[automerger skipped] Merge "Expose grantImplicitAccess in IPackageManager" am: 638bab6e48 am: 76f1cd8f98 am: 11b68dfbe3 am: e756364b69 -s ours am: 842782158b -s ours
am skip reason: Change-Id I0050593e4aa734af1a69a40a60746f7cf0ea72df with SHA-1 7d26c8c526 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1441675
Change-Id: I4136f89542fbb7e4f59b8f10e5cb7a942371e110
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions