tree 84d93df7af6b91cbb981591d4d0e5f32477c63a6
parent 95e3c0815cd7763a8921d535edb0e69ff7be17f2
parent 50ba921aa8c516754577eedc4017d1b7be95fb3c
author Tony Wickham <twickham@google.com> 1492193223 +0000
committer android-build-merger <android-build-merger@google.com> 1492193223 +0000

Merge "Ensure system shortcut icons always appear in correct order" into ub-launcher3-dorval
am: 50ba921aa8

Change-Id: Ie296f30e81bea966e1cfc88b81b33cbc1b5bf6e0