diff options
| author | Atanas Kirilov <akirilov@google.com> | 2018-09-28 20:07:58 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-28 20:07:58 -0700 |
| commit | 1e5ff973e7dac1131fadf240f4d7e34efc5732ea (patch) | |
| tree | e61412d5b96af3fb4447ef089ed7804a6e38a80a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 15c340dfa5867f10d56f3756733dc32193550d8b (diff) | |
| parent | 5b1976e3389a1f4586309297f72b2bf662f06d64 (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
am: 5b1976e338
Change-Id: Ie0044a79440f322080d2aeeb3a43cd01a45ad96b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions