diff options
| author | Atanas Kirilov <akirilov@google.com> | 2018-09-28 23:20:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-09-28 23:20:32 +0000 |
| commit | 3262a5ad5f0c7f2c8f0c98770fc5499b2f7f241b (patch) | |
| tree | 449cb932aa84c6ab7cd6b26e733a5c1d3eb1c4bd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 74d82f556d5e5a05c5a8861c1e8d2e48102c1993 (diff) | |
| parent | 8f9371a8b97143ece2557dd2074e0e2c479027e5 (diff) | |
Merge changes from topic "am-9d36a543-b4f5-4e8c-89c9-8dc49a83a644" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10 skipped: 90b8425c0b
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions