OSDN Git Service

Merge "Revert "Updating the widget tray"" into ub-now-porkchop
authorMark Brophy <mbrophy@google.com>
Mon, 11 Aug 2014 12:42:57 +0000 (12:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 8 Aug 2014 18:15:47 +0000 (18:15 +0000)
commit5337aea1536c11e5bfef49a14297fd4649baa3a3
treec7ed85e7d1f17182475da9d336dae9c4257c221a
parentd3ad9828d15f9c8fa435f2d59cd5a18e9ebee100
parentfd0f02ce428880e7dc59ebc94717c3e25d22cbb7
Merge "Revert "Updating the widget tray"" into ub-now-porkchop
src/com/android/launcher3/AppsCustomizePagedView.java
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/Workspace.java