Justin Klaassen eb88dbbbff Merge "Reset last activated time after auto mode changed" into oc-dr1-dev am: 13cfb46e41 ...

am: 93bd71f10a

Change-Id: I4e6dbdf32f99dcd6eea90aed9c36aee3240e3404

2017-06-21 00:04:40 +00:00

..

android

Merge "Reset last activated time after auto mode changed" into oc-dr1-dev am: 13cfb46e41

2017-06-21 00:04:40 +00:00

google/android

…