OSDN Git Service

resolve merge conflicts of a6194d3d92 to ub-launcher3-calgary
authorSunny Goyal <sunnygoyal@google.com>
Fri, 19 Feb 2016 19:12:14 +0000 (11:12 -0800)
committerSunny Goyal <sunnygoyal@google.com>
Fri, 19 Feb 2016 19:12:14 +0000 (11:12 -0800)
commitf94068462649986dad263f28226be6c514af47d3
tree7f9622b0e83c4f4fd2ebd40134140d5f1aac44a2
parentb347535cb09c5a7bebf0c928d9842236e43cd4b5
parenta6194d3d9205488d6f5400193f8d4d6aaf140218
resolve merge conflicts of a6194d3d92 to ub-launcher3-calgary

Change-Id: I29b3c3bb2c070e34c78c62b8f9086e6f3c8bd277
res/layout/widgets_view.xml
src/com/android/launcher3/BaseContainerView.java
src/com/android/launcher3/allapps/AllAppsContainerView.java
src/com/android/launcher3/widget/WidgetsContainerView.java