tree 864a50d77a80f93149d1e081fff3e5ca2f39d250
parent fd7b5bf6d4fa6a85cf6ad79df8cd143e0e81f9d4
parent 742048924f6b01658729f94c740f32cdd536dacf
author Sudheer Shanka <sudheersai@google.com> 1543389989 -0800
committer android-build-merger <android-build-merger@google.com> 1543389989 -0800

Merge "Fix ShortcutService handling of locale change during device setup."
am: 742048924f

Change-Id: I091a439fd5adc8bd3693af25bcef781bcaf7e2f6