tree bc43307945eef585a91f5af6d39a62669d763290
parent 706034e85b8f5397f0d532612cbf6f9dcd6a69b7
parent 1460475626e069cc8ee9c71057f40e8aabfc676f
author Tony Wickham <twickham@google.com> 1469855599 +0000
committer android-build-merger <android-build-merger@google.com> 1469855599 +0000

Merge \"Set shortcuts arrow pivot to side connected to container.\" into ub-launcher3-calgary
am: 1460475626

Change-Id: I9bf77425b52b74c3904d5fcb41ef7a233bbc5253