tree d580d5fb5deb0451d4fee83d2981362a95141aee
parent 377d311ba9bdac1f5a03b1f300635485d6c81034
parent 3533d3d0df1d54ffd66487494b14d06958cf2091
author Hyunyoung Song <hyunyoungs@google.com> 1493319921 +0000
committer android-build-merger <android-build-merger@google.com> 1493319921 +0000

Merge "[MANUAL] resolve merge conflicts of 59c0e0e91 to ub-launcher3-dorval-polish" into ub-launcher3-dorval-polish
am: 3533d3d0df

Change-Id: I71b7112898396f2cde60c6ff2471bcb76c05350f