tree 2b82b2b2c2e180ccbf2db4dcb810fa274397f181
parent f0c8fcb53c307bd7a1ca8a7a3e4a607c22c5fd12
parent 1ec34e0032c2c103b9de5cbd25031b352a7abf1e
author Joe Onorato <joeo@google.com> 1552516277 -0700
committer android-build-merger <android-build-merger@google.com> 1552516277 -0700

Merge "Add me to owners for batterystats." am: 274ce2d831 am: b5c0c5b1e8
am: 1ec34e0032

Change-Id: I41ec64a246d474c4d12495af1e7538cb43eb7dbc