tree 2f150c031cb768b63f89123ac25a81845d93d703
parent e848945af1c7851f4d59f83e757c1a8d50b4c517
parent 394ede2bc503b3bb1b309d0637e6cea2275e58c4
author Jack Whyte <jackwhyte@google.com> 1410561918 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410561918 +0000

Merge branch 'ub-now-master' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Launcher3 into ub-now-master