commit | f3b0992303beff569133f530969b13703ea91074 | [log] [tgz] |
---|---|---|
author | Salvador Martinez <dehboxturtle@google.com> | Fri Apr 20 20:22:00 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 20 20:22:00 2018 -0700 |
tree | e1f486f6850c12246c3278ba0c9113b6704fbd8e | |
parent | 26121c9055ccd813ff5f1b475e61cc8ac2387beb [diff] | |
parent | 4e6ef66fc14b39240e1bdf64f52bce066165ec4a [diff] |
Merge "Add composite string for battery summary in settings" into pi-dev am: a6b7a6fb33 am: 4e6ef66fc1 Change-Id: I9ec56fc3221ae14f311587e405b56031686f8eed