tree 5172cbd9b00481fbfeea343f5d97edad0e6dd35b
parent f969b92ec674d19e4fcc23b3959c74d22b1cc692
parent 0d21daace200502c45e0c976dd6a91eea03808e0
author Sunny Goyal <sunnygoyal@google.com> 1466719241 +0000
committer android-build-merger <android-build-merger@google.com> 1466719241 +0000

Merge \"Making some shortcut manager calls protected by MR1 version check\" into ub-launcher3-calgary
am: 0d21daace2

Change-Id: I4f109621ca2ebae03079bfd4fba57cc4f4a332bc