tree e9f08ac1e6518ad648d3a5b698d90c0e78bd077d
parent 6d45594971bf125500018c36eb3c40a665acff81
parent 5abb9f88efc42ce7c5b34f21944bc119ecb57cec
author Sunny Goyal <sunnygoyal@google.com> 1455228485 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1455228485 +0000

Merge "Separating out Launcher3 resources from Wallpaper resources" into ub-launcher3-calgary