tree afedb92c612df323cc24e782178694e07c973aa5
parent 819de103dbd19237a5245b7554e4532b5635e527
parent bb205d5e3e2a8878295ed18c656ec55e90dd288b
author Felipe Leme <felipeal@google.com> 1472496932 +0000
committer android-build-merger <android-build-merger@google.com> 1472496932 +0000

Merge "Fixed statuses on Battery Saver column." am: 21e0701f76
am: bb205d5e3e

Change-Id: I3c4e517b25b9e1c709baa11fe8568a8efecafea9