Skip to content
Commit 9007d0a7 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-81c620851fa141aaa28dc766c861df78" into udc-dev 

* changes:
  [automerger skipped] Merge changes from topic "cherrypick-config_batteryStatsResetOnUnplugHighBatteryLevel-zmiab0332q" into tm-qpr-dev am: 8b1b61c5 am: 29bbfcec -s ours
  [automerger skipped] Add config to control BatteryStats reset logic am: ebd856f4 am: 38b3bf05 -s ours
parents 79fa5f4c 47480516
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