am de04d557: am 7c122b60: Merge "Use SystemClock time to keep track of last...
am de04d557: am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev
* commit 'de04d557':
Use SystemClock time to keep track of last event times. (Bug 17995039)