Merge "Add batterystats -c data to telephony bugreports"
am: 289cf1ce14

Change-Id: I3dfb6b461c048c85298f3db7667d53166e3fb6db