diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 20:26:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 20:26:50 +0000 |
| commit | 690ac62a76f81b053ce1ba71d0b173f1f8d033fe (patch) | |
| tree | bfbac3fb566208c604155d8854f6d63695291c65 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ac39ce02c48fb2fd4d28a612e1c50e010a319543 (diff) | |
| parent | e45598e00d9fc373a79e5c91174bbb6c9237b657 (diff) | |
[automerger skipped] Merge "Use correct calling identity during camera permission check" into qt-qpr1-dev am: 197a9ad1d3 am: e45598e00d -s ours
am skip reason: Change-Id I5318fbb4426bec1448ecc398c86ea96500bb3189 with SHA-1 f7824ac70d is in history
Change-Id: I20f0d36273fe1f5a66133c4a7c27adb92d4dd88f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions