tree 5277f922a979b4ff95b5fcc891536bbc9656e4dc
parent 8e1b8091e6dceb9b3e4b5bfb3b00d1093254fdee
parent cdef9dd35d6a917714e41685ed907d236ec589dc
author Tony <twickham@google.com> 1469589273 +0000
committer android-build-merger <android-build-merger@google.com> 1469589273 +0000

Merge \"Match updated redlines for shortcuts.\" into ub-launcher3-calgary
am: cdef9dd35d

Change-Id: Ia402be24bf751dcca961e417a4c6a30b7dd741f9