tree b285d95e26abd94cd939b0bf32aff6c20b983ab2
parent 632af73a55bdb46acc9385e6f99dd077ca465d4a
parent eb2363d7d1221c245ba6654e5615b3bbc5076010
author Hyunyoung Song <hyunyoungs@google.com> 1430180493 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430180493 +0000

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