diff options
| author | 2021-08-15 04:22:53 +0000 | |
|---|---|---|
| committer | 2021-08-15 04:22:53 +0000 | |
| commit | 9c6d926e30c058c6dac97f936e71a7deac797f52 (patch) | |
| tree | a33bb958b28bfe349fd222b58c677b407925712f /libs/battery/LongArrayMultiStateCounterTest.cpp | |
| parent | 05605994afe83d507c3044e9b9a5a06b31f9064d (diff) | |
| parent | 4d7b75f5e8bc4d26f55f29670ad63868be2a6e1e (diff) | |
Merge "[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc11 -s ours am: 8f9e2a8115 -s ours" into sc-qpr1-dev-plus-aosp am: 4d7b75f5e8 -s ours
am skip reason: Merged-In I2a2d02a0d7e67ee9577857a210cb6157683e5598 with SHA-1 52846cd871 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15550161
Change-Id: I179dd30e79fc6f402c8a6ca9cecaaa399a75b4cb
Diffstat (limited to 'libs/battery/LongArrayMultiStateCounterTest.cpp')
0 files changed, 0 insertions, 0 deletions