tree 31ebc51a25f275e9aa28129aca1ab3ed4c0cb85d
parent 9de52e06ee4629782ff52eb2f1846c61339959db
parent 261194387beebaa7927ec4e310274218b651494d
author Sunny Goyal <sunnygoyal@google.com> 1456193506 +0000
committer android-build-merger <android-build-merger@google.com> 1456193506 +0000

Revert "Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage"
am: 261194387b

* commit '261194387beebaa7927ec4e310274218b651494d':
  Revert "Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage"