tree e00b943d38fe6b847abf07b44079d20b58a6134d
parent a63b604929ff2b6879eddc7734735ebf45a51465
parent 4f3e0aa4d3100f8e46b2ae30056a3acbada6e90a
author Evan Laird <evanlaird@google.com> 1560787084 -0700
committer android-build-merger <android-build-merger@google.com> 1560787084 -0700

Merge "Fix battery content description when there is no percent mode" into qt-dev
am: 4f3e0aa4d3

Change-Id: I98cdcf5e6922201ca7a67da835b6ecc5a7b69b77