commit a94ceffd7bfeaae23cf2474e9a05a17a20e25607
author Adam Lesinski <adamlesinski@google.com> Tue Jan 26 18:18:19 2016 -0800
committer The Android Automerger <android-build@google.com> Wed Feb 24 13:21:13 2016 -0800
tree 96e58b62f0104ea0bf66546d86d1d71b54da0dfd
parent 2dbd40c007eaef20edd92856cf8c1652b926c77e

DO NOT MERGE ANYWHERE: Don't change screen on time on time changes

Screen on time should be measured in elapsed realtime, not wallclock.

Cause a checkIdleStates to occur when reloading stats
(on rollover and on time change).

When time changes occur in the negative direction, the new stats file
we create can overlap the previous one with regards to its end timestamp.
Use the begin timestamp to determine which of the latest stats to merge.
(b/22716352)

Bug: 26488100
Change-Id: If31b29bbbee9e98401205b5e26bce86e181286e7