tree 04ad117126a0f84325f15d9824c267e7f80690b5
parent 622c64b4099036877311bfb66730897351f5f4f0
parent 433b9738b35c48f8c957d49344f3d88c312b38b5
author Aaron Huang <huangaaron@google.com> 1615429271 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615429271 +0000

Merge "Remove IBatteryStats from ConnectivityService module" am: f3827cf444 am: 433b9738b3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddff8e1ac79c589ddf34518b2e8f9627be25c550