tree 7e0ac2b3cd64410fc3d9852501fe227c1971dd57
parent 1cd93b8f750338f62c074993068347ba19e50c34
parent c22ec2d0fea410e060a347013fe7e3c10d4b4c96
author Evan Laird <evanlaird@google.com> 1497990516 +0000
committer android-build-merger <android-build-merger@google.com> 1497990516 +0000

Merge "Fix battery percent text not updating on Font size change" into oc-dev am: 2ca91661f0 am: 0faa2e6891
am: c22ec2d0fe

Change-Id: If228454ba1cd2010406884b13c6e8abd076e6e2c