tree bcf942a39972f5bab3d5fef6c824f6ee9d30ec0e
parent 3abe12e9330cbaab531369a03b40a4ac0c9c2478
parent f685c7e5f7750ddb1ca3d5f52343b92cb99fc130
author Tony Wickham <twickham@google.com> 1444682068 -0700
committer Tony Wickham <twickham@google.com> 1444682068 -0700

resolved conflicts for f685c7e5 to ub-launcher3-master

Change-Id: Iddf78c166f9ab89ffae2ddc819c9ba5cf5e988be