diff options
| author | Beverly Tai <beverlyt@google.com> | 2021-07-29 19:14:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-29 19:14:17 +0000 |
| commit | 569f11095c97e261b41a40d4b1f0ac3b308a2c4b (patch) | |
| tree | b994634e9bedf449ceb0f9d6a5782087ad666870 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5a711d321ee2b41a0dd6c4a8117f932fc1663b17 (diff) | |
| parent | ebe9e34fbb7113f2c9901b3417f1703e14f6711e (diff) | |
Merge "Only set userHasDeviceEntryIntent on keyguard" into sc-dev am: ebe9e34fbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15403138
Change-Id: I0f47940691488dc6b57207f4510051f3884e6155
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions