tree abd3c5b6d6b6ead1c3ac1682e166b65d67490057
parent e5298a57152674a9823914e12ba7b16f63bfa14f
parent 12fec49834d247cfe65ceec95568daf384083c58
author Tony Wickham <twickham@google.com> 1488394879 +0000
committer android-build-merger <android-build-merger@google.com> 1488394879 +0000

Merge "Merge deep shortcuts in rounded rect" into ub-launcher3-dorval
am: 12fec49834

Change-Id: I7662f40eade7665f2aa1aba2e341c4ed126a8f14