tree 7153d8712237f9fb2d12ad3878dedc6c3a450e6c
parent 3ec8c46765c83ccbf1c29be19b969295e207acf1
parent 8b017e52da1af6310519b592b96a367bd34cad3f
author Jon Miranda <jonmiranda@google.com> 1495483728 +0000
committer android-build-merger <android-build-merger@google.com> 1495483728 +0000

Merge "Keep elevation during the Folder clip animation." into ub-launcher3-dorval-polish
am: 8b017e52da

Change-Id: I5afa15cad5062d3c8b9581b816bf975f50783629