tree f786139d075c4e30cb324a97e0652b6b4038d76e
parent 5766d6e443c9dc79273300a7dc1a36efcc7b9d4f
parent 950d94f689122ff63d14eda16d1cbe2c1148164f
author Salvador Martinez <dehboxturtle@google.com> 1524266845 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1524266845 +0000

Merge "Update settings main page battery string" into pi-dev