summaryrefslogtreecommitdiff
path: root/libs/battery/LongArrayMultiStateCounterTest.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2021-08-17 20:32:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-17 20:32:24 +0000
commitd10bd881cab8897b9217665528f2107e935091d0 (patch)
treeefc57a63a4ca80c4b887d2c619f6800d2a39ffe6 /libs/battery/LongArrayMultiStateCounterTest.cpp
parent1ac43ba4e0b2f67269dff94121869207b87e7059 (diff)
parentf79c362008297d7278bfc99c9e12da17b96b1252 (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: f79c362008 -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: Ib95172f575d481bc355038395fd18ba997fa8a38
Diffstat (limited to 'libs/battery/LongArrayMultiStateCounterTest.cpp')
0 files changed, 0 insertions, 0 deletions