tree 79f7fa6d61ca9ba6895837a7f4968d06104b814b
parent a729006c4cf2ba3b7b23c7a02e38808a6a54252b
parent 1153e9eb89154f94f3d1e3c6df446d15f401cc46
author Hyunyoung Song <hyunyoungs@google.com> 1497547817 +0000
committer android-build-merger <android-build-merger@google.com> 1497547817 +0000

Merge "Add LAUNCHER3_SPRING_ICONS feature flag b/34841763" into ub-launcher3-dorval-polish
am: 1153e9eb89

Change-Id: I905acca335e99f0fe2fe7b0c750766d052665b02