tree 3a1ce0bcdcc74e2fabee2c20bc4862f2f5a96cfb
parent 7b4458b6ecea5c124b627917101955a6208ef4ff
parent dc9988b6e284e7d722f2830ca977c5fd604aa187
author Benjamin Schwartz <bsschwar@google.com> 1562087229 -0700
committer android-build-merger <android-build-merger@google.com> 1562087229 -0700

Merge "Increase size of BatteryStatsService stats buffer" into qt-r1-dev
am: dc9988b6e2

Change-Id: I09ea0605e66d9e732ab133f77493b3d0015c1896