OSDN Git Service

Merge "Add screen usage string for battery settings" into oc-dev
authorjackqdyulei <jackqdyulei@google.com>
Thu, 18 May 2017 19:25:57 +0000 (19:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 19:25:57 +0000 (19:25 +0000)
commit3ab2ca5cc9cde536235a9465f0ee0a29ca18cb4b
tree70c7ae2bd978aa84efdf4765d554eaa7e10e5d3c
parent145c364479946df6704a546eced73ed4950557a9
parent28cf04d994c6423ae7fc7b833b0e9d32ca2c8a08
Merge "Add screen usage string for battery settings" into oc-dev
am: 28cf04d994

Change-Id: Ie60e5de8164bfc16fa29ca16b63caa08812db52f