summaryrefslogtreecommitdiff
path: root/libs/battery/LongArrayMultiStateCounterTest.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2021-08-13 20:51:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-13 20:51:44 +0000
commit8f9e2a8115013898ef4e2b5270ac9a642dd39abf (patch)
treea0a4b40d29d7427a998876a668f447a9c7f3c959 /libs/battery/LongArrayMultiStateCounterTest.cpp
parent5b036cfe5a30634064906222a9cc8670497b8bcb (diff)
parent62d46ebc116352834db9798531b7c6ad6692dea5 (diff)
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc11 -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: Ia1edb69c0b2eabbcf5841b0ddf043e98a8a64740
Diffstat (limited to 'libs/battery/LongArrayMultiStateCounterTest.cpp')
0 files changed, 0 insertions, 0 deletions