diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-11 17:12:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-11 17:12:40 +0000 |
| commit | 9b6b26563e4f1aacc91cc6a35ab93e8d8e930e0b (patch) | |
| tree | 254332fc656b993cca638268992f27d6d5942678 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | df08ff39ed964cb865a97f9cb8611f58aad31562 (diff) | |
| parent | a48832325d509d764b6ecf9bd8f2d2419314ce25 (diff) | |
Merge "[automerger skipped] Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 am: 21e36702cd am: f312c9e864 am: 6717abba6e -s ours am: 953586c0e7 -s ours am: 558392e1ed -s ours am: 4beba29d08 -s ours am: e1555adbb1 -s ours am: 6ca71a167c -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions