summaryrefslogtreecommitdiff
path: root/libs/battery/LongArrayMultiStateCounterTest.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2021-08-17 19:46:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-17 19:46:20 +0000
commitf79c362008297d7278bfc99c9e12da17b96b1252 (patch)
tree50270ca1a2baa3a8ef8275504be9a8dd31baf7bc /libs/battery/LongArrayMultiStateCounterTest.cpp
parent8d47022663f2701a94991f1feae8fc6ba7a974ad (diff)
parent059bc47a0bd49f90f5dff078b1d66d7b5fd71032 (diff)
[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 3010764a8a -s ours am: 059bc47a0b -s ours
am skip reason: Merged-In Icec03f01321c64d95d0bf1487ee9a1f4ae10529f with SHA-1 3aebb8c20e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15571798 Change-Id: I26b4450c1287a981af3fab86cef4b5ec4de3046e
Diffstat (limited to 'libs/battery/LongArrayMultiStateCounterTest.cpp')
0 files changed, 0 insertions, 0 deletions