tree d6e3a56f80b4ec9b4b408de96045ecee4fab5c7c
parent 1c2e91165c94372900b9a3aefe9d4a82f173c0f6
parent 258c743697d3a7dd0773c33aee549327ce8b6abe
author Lucas Dupin <dupin@google.com> 1523413717 -0700
committer android-build-merger <android-build-merger@google.com> 1523413717 -0700

Merge "Shelf alignment and animation fixes" into pi-dev
am: 258c743697

Change-Id: Ic39ca931edf9c0da6925e9572b4660e08ca5f180