tree caf8f035e86c431176ccfe9f7fb6978babbebdf0
parent 26d2484b57dac3b4041904dbb307063b4cce433b
parent ce09f306f790495fffcc0fdac909da02e1ac2164
author Neil Fuller <nfuller@google.com> 1562246031 -0700
committer android-build-merger <android-build-merger@google.com> 1562246031 -0700

Merge "Revert "Minimal fix for ControlTest"" am: cd7c4f753d
am: ce09f306f7

Change-Id: Ie91bfd71b106e86e1aedb6fbd2a121803f3cb381