diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-03 17:36:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 17:36:05 +0000 |
| commit | 54f357c08540d611cf3ab4e15cf4e3fb00d0fcf5 (patch) | |
| tree | 2489c9d864368707955bc9b5f5696f95f3d6c902 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d0251d210b04229f656d8ffd1d2102d9ccb37195 (diff) | |
| parent | 5a995188c3f49b73c06009ee760c6ee56ed04b71 (diff) | |
[automerger skipped] Merge "Disable Bluetooth if BLE was disabled while enabling" am: b101411b95 am: 47c641706d -s ours am: 070dd6249a -s ours am: 73da6b1079 -s ours am: 5a995188c3 -s ours
am skip reason: Change-Id I4f92581465de81ffe9b45fb042b5cc43e5ab4136 with SHA-1 f7065dc952 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322638
Change-Id: Iff07d99eac9f177e870a747ce1985261ce9348a3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions