tree 3c86764e27fcaa5db11cc444d589fe54d079f44d
parent 8fc7b3e9d4eacbf2b55632c471b9ff01a364ef55
parent 56726ca04c99a9d8b1862d2384c250f8a4309690
author Lei Yu <jackqdyulei@google.com> 1547588742 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1547588742 +0000

Merge changes I3ee2313c,Ibbf9eb2a

* changes:
  Remove divider line for battery card preference
  Add CardPreference in battery settings page