diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-25 05:10:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-25 05:10:35 +0000 |
commit | ef3a1d0f2b1c9f9f649a99ebcc907b3dbd1c389c (patch) | |
tree | 0fdfa4b863a02763464366600aceef2b830ec5ff /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 1a1eccf56f7e1c1c2e8e75b8ab86d6ccf36244f5 (diff) | |
parent | bfb8bb6a5b08deb0170aabdcf734a0e4238aa454 (diff) |
[automerger skipped] Merge "[SettingsProvider] fix WriteFallbackSettingsFilesJobService holding wakelock" into rvc-qpr-dev am: 1c687fa8ae am: bfb8bb6a5b -s ours
am skip reason: Change-Id I3bfbcf5a7b21f142fd00130e1a57232bc02aedb6 with SHA-1 690888547a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12393455
Change-Id: I0840cd15bcd07e62f648c50a7b86bbf1c92c8757
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions