tree 8d0eb616b348e42d3db7bc889dace126a635c3fb
parent 5bbba815fd59c47ddfdee2dad8266d50dc5b182a
parent 51889b0be83dc34c9752fc066d0d6e75ab4f5e26
author Tony Wickham <twickham@google.com> 1488394642 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1488394642 +0000

Merge "Merge deep shortcuts in rounded rect" into ub-launcher3-dorval