tree f86e5773deeca8390f8e6b839ea82ab0f0bc3e09
parent bad658e6161a07389341ef069f99c75ed62299e8
parent 1e3d490e08b06750d467e144e5d74ea420c59613
author Tony Wickham <twickham@google.com> 1468962250 +0000
committer android-build-merger <android-build-merger@google.com> 1468962250 +0000

Merge \"Implement ranking for shortcuts.\" into ub-launcher3-calgary
am: 1e3d490e08

Change-Id: I235c665b1c0a08bdb777b031e1371a302524f934