tree fa66aad52a372f49721795662123ef48df261d46
parent da89fc4d299b35dd2245b7933037fc3d54b75b49
parent ec1b1c542ca0648747b3b0bc3fd45922caa8ddaa
author Tony Wickham <twickham@google.com> 1466627958 +0000
committer android-build-merger <android-build-merger@google.com> 1466627958 +0000

Merge \"Add support for launcher shortcuts.\" into ub-launcher3-calgary
am: ec1b1c542c

Change-Id: I1993ee5db57bdb300430ef5b106c4c95d6f50a0c