am skip reason: Merged-In Ia4041e10156eadb37799ebdc12b33fbb3de4c54d with SHA-1 c010e721ea is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2486781
Change-Id: Ie650cd3e3da45a3ac8c7005baa498dff102c7a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ia4041e10156eadb37799ebdc12b33fbb3de4c54d with SHA-1 c010e721ea is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2486781
Change-Id: I3a6e41258bee7ff50e05d187be53d6192572d88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Ia4041e10156eadb37799ebdc12b33fbb3de4c54d with SHA-1 c010e721ea is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/20947041
Change-Id: I866128a579fe5735771b53c4a5f902119bb991a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2338115
Change-Id: I99dcd666dcee8fdeca7885005375427b505784e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2338115
Change-Id: I01a65938928d4d7864575b9153a27457bedf28f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2338115
Change-Id: Ie92f53a891cbaccec6bc6c26384b09f2e5ceb98e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2338115
Change-Id: Ie8f288c96cf1f6c143e456c2a5f89fe97813f8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2338115
Change-Id: I24283739c67bab0b38b62fb856782808633a2cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Bug: 254752713
Test: build and check $OUT/installed-files-vendor-ramdisk.txt that GSI
keys are included
Change-Id: Ia4041e10156eadb37799ebdc12b33fbb3de4c54d
Merged-In: Ia4041e10156eadb37799ebdc12b33fbb3de4c54d
(cherry picked from commit c42b5e2fc5e9eeb2aee93b211b8cf2985a913930)
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/20132575
Change-Id: Ia5d9d6b8a307936ad57749bf9cc6a00a6360860f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2185745
Change-Id: Iaa29568512cc1267af2eb329346761ffb3ec2344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2185745
Change-Id: I55f71a74420a3101e8c04331ad492737ae569e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In Iad7403dcbc0ad12b77154003f4aa61afedf2224f with SHA-1 edf8707658 is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs-common/+/2185745
Change-Id: Ib122444c9eba788a95dac793de08faa379ca7b87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6844a141739f93154d10debc29c7565f92349d25 with SHA-1 20b039192d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/19094399
Change-Id: If12a03613eac7a634f44805c31855cc4bf0803a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6844a141739f93154d10debc29c7565f92349d25 with SHA-1 20b039192d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/19094399
Change-Id: Iddca79e1f20f29170ee5d90d817c3d4357ac7d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I6844a141739f93154d10debc29c7565f92349d25 with SHA-1 20b039192d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/19094399
Change-Id: I005f183fdbf40be59143ee48f6b52b70d2de3165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
AoC power stats are reported in ticks that are different frequency
in different SoC.
Bug: 233923713
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I047d7ae163941c2168dcd8a0ea34da73ab4a8477
Merged-In: I047d7ae163941c2168dcd8a0ea34da73ab4a8477
Signed-off-by: Darren Hsu <darrenhsu@google.com>
Revert "Allow libaoc to be used in more contexts"
Revert submission 18605412-b-233923713
Reason for revert: Completely broke master-without-vendor
Bug: 235533674
Reverted Changes:
Iacd541815:Use libaoc to provide consistent timestamp calcula...
Id31ee3439:Allow libaoc to be used in more contexts
Change-Id: I3345d0e4baa8d5dce22be20f0213ad1421ce1a90