diff options
| author | Atanas Kirilov <akirilov@google.com> | 2018-09-28 18:23:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-28 18:23:46 -0700 |
| commit | 5b1976e3389a1f4586309297f72b2bf662f06d64 (patch) | |
| tree | 6cf3f9b836359ca6fdc2fc2a8b2c6db064775caf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1fc26e2022f5b335d106e55dbf17acff8cac9d5b (diff) | |
| parent | a97e0908a4155923ab8a273c2e4741c5fc5aaba1 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev am: 74d82f556d am: 3f2bc41d8b
am: a97e0908a4 -s ours
Change-Id: I84dd1504a9335e692b3aebf8e696514e17048de4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions