tree e3b7b40300ff757ad23c1b2f621d06d191b4414a
parent cc07e7a9c6e383f35a8de717be71201f666b01a8
parent 892c74d460ad98c6306420e1127c9aa3e505ba25
author Winson Chung <winsonc@google.com> 1377554889 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1377554889 +0000

Merge "Fixing folders to always show in view, removing old assets and references to LauncherModel count." into jb-ub-gel-agar