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