tree b3de1bd6acbaafa4ac13748ddc716db706df1334
parent c7ce1a09783e7b1d32576d381e9bfe312c57c089
parent 0e490d9208de480ed38fe31a12029fc59b0955e9
author Winson Chung <winsonc@google.com> 1521056533 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1521056533 +0000

Merge "Revert "Centralized quick step/scrub/switch logic (1/2)"" into pi-dev