tree d2e0392c54452274c6af1fa8d98d698f8b195b61
parent 19fbdf450212b55b60e7efc21bfd4d748b70cf22
parent 9927d3f7a9075e1938fcabd3ec92e4d613d20f99
author Hyunyoung Song <hyunyoungs@google.com> 1497909268 +0000
committer android-build-merger <android-build-merger@google.com> 1497909268 +0000

Merge "Add spring effect to adaptive icon foreground layer b/34841763" into ub-launcher3-dorval-polish
am: 9927d3f7a9

Change-Id: I4e02c8f4b4dfd401795717f4101fde9124e0530b