Dmitri Plotnikov 0751597bf4 Merge "Fix system service power calculation when measured energy is available" into sc-dev am: 16d1188b7d am: c22cb8480d am: 9dec696e82 ...

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

Change-Id: I40265d4c4552474b989dd16fc061952dbcb0211b

2021-05-26 21:06:45 +00:00

..

api

Merge "Hotword: Add onStopDetection() for software detectors." into sc-dev am: 76660ef721

2021-05-26 11:10:19 +00:00

java

Merge "Fix system service power calculation when measured energy is available" into sc-dev am: 16d1188b7d am: c22cb8480d am: 9dec696e82

2021-05-26 21:06:45 +00:00

jni

Merge "Add TunnelModeStateListener in java+jni" into sc-dev am: ee1219ac1d

2021-05-26 10:54:14 +00:00

proto

Merge "Updates OWNERS files" into sc-dev

2021-05-24 18:30:19 +00:00

res

Merge "Switch long-press power behavior in AOSP." into sc-dev am: 3c804441bd

2021-05-26 11:27:59 +00:00

sysprop

…

tests

Merge "Fix system service power calculation when measured energy is available" into sc-dev am: 16d1188b7d am: c22cb8480d am: 9dec696e82

2021-05-26 21:06:45 +00:00

xsd

Update location bypass allowlist

2021-05-21 09:25:47 -07:00

TEST_MAPPING

…