Skip to content
Commit 2c2239cc authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Proportionally attribute Mobile Radio Energy... 

[automerger skipped] Merge "Proportionally attribute Mobile Radio Energy Consumption to Phone usage." into tm-qpr-dev-plus-aosp am: 392f8faa -s ours

am skip reason: Merged-In I5db49ea7c88cfd502db36265ae5a6555f728d2f7 with SHA-1 4789053d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22126039



Change-Id: I96da2b113b7e910e91c7d5c43c79d71afd86ae2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 052b387a 392f8faa
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment