tree 33b6a34980b699d575388ce7f2dba2240a491f36
parent 215bf099defc77dff2425ab0919b1d4c157f6b5e
parent 2bbe8e992ac4599bb5ae36f26eac318c592bf871
author Salvador Martinez <dehboxturtle@google.com> 1534952571 -0700
committer android-build-merger <android-build-merger@google.com> 1534952571 -0700

[automerger skipped] Merge "Update severe (5%/1 hour) warning to send through battery saver" into pi-dev am: 3d91fa44b7
am: 2bbe8e992a  -s ours

Change-Id: Idb1f5bea8a0ae79d066ba94e926baae1275e5c2b