diff options
| author | Jordan Liu <jminjie@google.com> | 2021-01-16 01:47:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-16 01:47:32 +0000 |
| commit | 4e9148e95a1b34d12f0ccc1fc8e133b57c15238c (patch) | |
| tree | 736aaaa183780480ebea2b92dc247ecfc3f0a058 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 97c553822957a9842e3b586f667f4fd98ee7399a (diff) | |
| parent | c36300a0eaf55d85554dea1bc3a4ddcf80fc7b57 (diff) | |
[automerger skipped] Merge "Allow CBR when device owners is set up" into rvc-qpr-dev am: 76f79a776d am: c36300a0ea -s ours
am skip reason: Change-Id I98ac9eecd8a497541d9ce0761920db1252eb72e0 with SHA-1 554e10dc26 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13350586
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3f2103630fc6a8d72672868b6979f3a0a6769b39
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions