Salvador Martinez 4e6ef66fc1 Merge "Add composite string for battery summary in settings" into pi-dev
am: a6b7a6fb33

Change-Id: Ia74ede8fb5f16c5ec89ca15e81b977ed272d9dda
2018-04-20 17:30:06 -07:00
..