tree ae4d6075c40cf137758d36d8ab50af291865b0f2
parent 05c2340cd8f88f87133238cad2458219340919fe
parent 16c6d3abe47272b2d971f874e2bb713fcbbc8615
author Sunny Goyal <sunnygoyal@google.com> 1469643743 +0000
committer android-build-merger <android-build-merger@google.com> 1469643743 +0000

Merge \"Updating the label for shortcuts aciton\" into ub-launcher3-calgary
am: 16c6d3abe4

Change-Id: Idda7b26aef5c133a51e234f2135fbd6cd4e5c828