tree 31ebc51a25f275e9aa28129aca1ab3ed4c0cb85d
parent 7de283a5ecb39bf1f264b5d0d8019b6fabdd6ae3
author Sunny Goyal <sunnygoyal@google.com> 1455833363 +0000
committer Sunny Goyal <sunnygoyal@google.com> 1456192974 +0000

Revert "Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage"

This reverts commit fc956e5a2a818c06ed3424e15b0aa20a3f604658.

Change-Id: Ib3b5156b8fc3cad35c4634d61d5390c848ce1f93