tree 3d2db1479159c64850d4a078d6fc1e870efa58f5
parent abeebf173e55a52406e7e14cde404df97759d459
parent 92b686dd6964325de21660b45e56fc57860fe4bd
author Mike Digman <digman@google.com> 1527206393 -0700
committer android-build-merger <android-build-merger@google.com> 1527206393 -0700

Merge "Merge "Fork navbar layout for quickstep" into pi-dev am: 5d8559fea3" into pi-dev-plus-aosp
am: 92b686dd69

Change-Id: Ic2c63428d5f217ef53a6233d01292be26bd89699