jackqdyulei 3ab2ca5cc9 Merge "Add screen usage string for battery settings" into oc-dev ...

am: 28cf04d994

Change-Id: Ie60e5de8164bfc16fa29ca16b63caa08812db52f

2017-05-18 19:25:57 +00:00

..

com/android/settings

Merge "Add screen usage string for battery settings" into oc-dev

2017-05-18 19:25:57 +00:00