tree c2c38713c568566c18fedc79aa401cbbb1c30677
parent e5931a552acf2dd86f9ef8e015c7dcee22d35c5c
parent 23cae10576ff775b24f65876790dec84f3efa00c
author Tony Wickham <twickham@google.com> 1493944309 +0000
committer android-build-merger <android-build-merger@google.com> 1493944309 +0000

Merge "Don't delete legacy shortcuts in loadWorkspace()" into ub-launcher3-dorval
am: 23cae10576

Change-Id: Icb8b72be29249e5df4505bb02c75c6f2a90d6bee