Merge "Fix Modeled vs. Measured check in BatteryStatsViewer" into sc-dev am: ef6dd9b138 am: 8c3415d358
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14667209 Change-Id: Ifa9e6b43f0681910ad244584159af559fc3cf217
This commit is contained in: