tree e191f14e1319d8fc93c03c3c56a44fa6b0dc9b99
parent 427e41bd0743bc5d56cf6ed89f1dfc64d0ad96aa
parent b9683d4920b1a37843684c5fece49aa7528b0213
author Salvador Martinez <dehboxturtle@google.com> 1524266845 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1524266845 +0000

Merge "Add composite string for battery summary in settings" into pi-dev