tree 8d3abab696dfd102cf2f9096dda0577a20e9e72e
parent 3f7df53dda43d05c7a40ed8c4114b63189936ffe
author Jonathan Miranda <jonmiranda@google.com> 1522109424 +0000
committer Jon <jonmiranda@google.com> 1522109524 -0400

Revert "Merge branch 'ub-launcher3-master' into pi-dev"

Original CL loses the commit history. I believe this is due to doing the merge on master and cherry picking to pi-dev. Tested locally that reverting this results in no conflicts when doing the merge properly on pi-dev.

This reverts commit 3f7df53dda43d05c7a40ed8c4114b63189936ffe.

Bug: 74794600
Test: manual test
Change-Id: I58f3bb1bd5ce789be380bac9716efd2627a90f92