diff options
author | Fiona Campbell <flc@google.com> | 2020-12-08 11:03:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-08 11:03:19 +0000 |
commit | 69534c6aee88c7e6d56f3ada417dce4f1c603100 (patch) | |
tree | 9e9f943d44142956ea47186b5c5ed8774c188a3e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 79c7179a6ae5c9baa233e9d8f1d34f3c8ca2711a (diff) | |
parent | 83791181738a2e22a41ff15aff793102b005b764 (diff) |
[automerger skipped] Merge "Persist screen brightness setting through upgrade" am: 2a747f002f am: a333c1fb5e am: 8379118173 -s ours
am skip reason: Change-Id I2a3b996c8747e3c5f1d181bbdd438c70bf23d08b with SHA-1 af6cd6dc30 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517740
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icf41f9a047cf315ba2f22c96768193b7db1510e9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions