diff options
| author | Atanas Kirilov <akirilov@google.com> | 2018-09-28 21:40:59 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-09-28 21:40:59 -0700 |
| commit | 0ef7bd1a0db8cae4c8d6b01febb73c43c60ed4b0 (patch) | |
| tree | 21708f7a6f625221c800ca77e136839efdf5dc65 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 55aec51899875bbd8bf665a0637ac130a380b579 (diff) | |
| parent | 1e5ff973e7dac1131fadf240f4d7e34efc5732ea (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
am: 1e5ff973e7 -s ours
Change-Id: I6c806a752f9c88eb8c99e9c6fccecc684ab88bd8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions