tree c0a6065f5d8bcea8a747f23d98ba348ff21ed547
parent 969350d7662db163cd8c344c83586e60d1188e88
parent dce01fe0294cf883f5c47b078398a3915ce5a113
author Tony Wickham <twickham@google.com> 1493944517 +0000
committer android-build-merger <android-build-merger@google.com> 1493944517 +0000

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

Change-Id: Iade8f76803a172b96eea3e2f3b330c21c4653464