tree 51473c7790cfb796c8e5095029701f0d59feef80
parent c7ff1f40b24446f2cc875fc70196197e9163e4fe
parent 54fe5eec64dfbc8d10c0fcd2d2c3c1d1a6c337c9
author Adam Skory <skory@google.com> 1410561567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410561567 +0000

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