diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-03-18 22:22:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-18 22:22:32 +0000 |
| commit | 7de717e3c3e93dd125c3c51d84ae7fdeed580fe3 (patch) | |
| tree | 04b05b37fa5717ca7248ab14decda600f8eed5cd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fbb1317a2183cef98f03fe123d1d04e09af257ee (diff) | |
| parent | be26ce76b76441782ce63b61ce1198192da8ab1b (diff) | |
[automerger skipped] Merge "Fix an NPE in BatteryService" into rvc-qpr-dev am: 2b534bde0e am: be26ce76b7 -s ours
am skip reason: skip tag Change-Id Ic382d268f40a8ea31aaeedc7a85b6dc9b4e6c210 with SHA-1 780ca87adc is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13856050
Change-Id: Ia54bdf8c4d78d89c6d0a622bceaf60056873e125
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions