OSDN Git Service

resolve merge conflicts of 0e04980310 to ub-launcher3-calgary.
authorSunny Goyal <sunnygoyal@google.com>
Wed, 3 Feb 2016 19:41:36 +0000 (11:41 -0800)
committerSunny Goyal <sunnygoyal@google.com>
Wed, 3 Feb 2016 19:41:36 +0000 (11:41 -0800)
commitbda3ff8f20b30412d8e7c6d3a48a26078e66d6b2
tree6000309e49b8319b1760c7bf7934db97ef20ff9a
parent3c4906949f9d7a978caa5ffe9dfe8e6e153876ef
parent0e0498031092488ff166145c12ce36cc0a80c490
resolve merge conflicts of 0e04980310 to ub-launcher3-calgary.

Change-Id: Ic4526dfc388590aa0288936d827f19060922529f
src/com/android/launcher3/Folder.java