summaryrefslogtreecommitdiff
path: root/libs/battery/LongArrayMultiStateCounterTest.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2021-08-13 21:31:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-13 21:31:41 +0000
commit159abd742f7556bf19b336a2b6bcbba1a2f0d6fa (patch)
tree072a590eededba01c8dbf420192b3b69d6aca608 /libs/battery/LongArrayMultiStateCounterTest.cpp
parent7a8447fabae2d48f993c62136a19867da9907a69 (diff)
parent8f9e2a8115013898ef4e2b5270ac9a642dd39abf (diff)
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc11 -s ours am: 8f9e2a8115 -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: I8e14dfbeb2b39bf6279dc5bc744ba8a6faad2183
Diffstat (limited to 'libs/battery/LongArrayMultiStateCounterTest.cpp')
0 files changed, 0 insertions, 0 deletions