tree 52fe7b14987694cedb007471a43a1ef24b1454cf
parent edadc51db490867b563148e35a1157e09cb8796e
parent 765ff3d7c9f52a6383ae72887b54ae79de118173
author Tony Wickham <twickham@google.com> 1472514958 +0000
committer android-build-merger <android-build-merger@google.com> 1472514958 +0000

Merge "Use promisedIntent instead of intent when deep shortcuts are restored." into ub-launcher3-calgary-polish
am: 765ff3d7c9

Change-Id: Icd239f0afb1f17a1f65a015b6edca34299acb0ab