tree a53e5dc8c7946b39a858ee666e714dc740a12473
parent f1468af68ca8e2a7d0ff1d8a424d5b3b95c7357b
author Sunny Goyal <sunnygoyal@google.com> 1455744260 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1455744433 -0800

Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage

Change-Id: Ifd0d717d70aff4c83c9eb5cba397d04500b2c869