Justin Klaassen 93bd71f10a Merge "Reset last activated time after auto mode changed" into oc-dr1-dev ...

am: 13cfb46e41

Change-Id: Ic54dae12f687caf5288ccbf3cd3c842ce4742721

2017-06-20 23:56:13 +00:00

..

android

Merge "Reset last activated time after auto mode changed" into oc-dr1-dev

2017-06-20 23:56:13 +00:00

google/android

…