diff options
| author | Benjamin Schwartz <bsschwar@google.com> | 2021-01-06 17:50:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 17:50:11 +0000 |
| commit | 32ae89039faa48ac13f96d471e6483b99f522fd9 (patch) | |
| tree | 0f232f20e9adeca6ef74731f13c9f2457f2586a6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ea848623c96b0c74d9554d6b0885577fee9c926a (diff) | |
| parent | 754d78cb7ddb475bfbe92f02a4ac9b2e8c58e655 (diff) | |
Merge "BatteryStatsService: Allow unknown wakeup string" am: 754d78cb7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531984
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I04cd90efb331c4dbbf4309163e710951e660dfa1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions