diff options
| author | Nathalie Le Clair <lcnathalie@google.com> | 2021-02-09 17:20:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-09 17:20:00 +0000 |
| commit | 6eade6231455b0606aa08f9beef44520965e5576 (patch) | |
| tree | 59e26d600d4bb1238786f2d39e0f0d02dc9c74c1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8fc0749ed7fee9929a95bb9ba4f711287a2d7733 (diff) | |
| parent | 0831b52c25eb67c96127fd76051410664255d4e6 (diff) | |
[automerger skipped] Merge "Fix CEC init twice in normal boot" am: 1d1c6ae770 am: 158f098e07 am: 0831b52c25 -s ours
am skip reason: Change-Id I50a1423ef223156f98c6f21e9be82130a284295a with SHA-1 3ecb6747a9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517502
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id821209bf6812333a160bee08d58e2445cd87627
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions