OSDN Git Service

resolved conflicts for 8ac727b2 to ub-launcher3-burnaby-polish
authorSunny Goyal <sunnygoyal@google.com>
Wed, 23 Sep 2015 23:12:02 +0000 (16:12 -0700)
committerSunny Goyal <sunnygoyal@google.com>
Wed, 23 Sep 2015 23:12:02 +0000 (16:12 -0700)
commitf27cb0e6b1edb2a53de64fdd12d25f400a3acdd9
tree846cc10d71a2452f4ba7acdc242c1bc3366c6a7c
parent5a7a1ce0a7affdff02029793ac24b2581075acee
parent8ac727b2c6627028960a1efe18ab9c72442eef48
resolved conflicts for 8ac727b2 to ub-launcher3-burnaby-polish

Change-Id: I34e679bae7faae3c7ca725263fe6cc7c5611e63a
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/Workspace.java