diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-09-10 21:56:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-10 21:56:49 +0000 |
| commit | ffd5215d87b0c16539a17911601343b2291de5a1 (patch) | |
| tree | f39a45a378c2f6cac1c855aaffe1dfcd854aed89 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4ca7d9f55b5e58800762ab01b6a567c90ce3f811 (diff) | |
| parent | 37680920b8e6ce55bb0142987620d1e8c7e75108 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" into rvc-qpr-dev am: 9d451d5576 am: 37680920b8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12522607
Change-Id: Ie56d5207275837fd58a9bccd16d7f1d4f714e6ad
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions