tree 3921d1d9744dfc7ee7b0ddd1486c86cad63b80d7
parent 06c93dd0be13bcb0698d9d8c060bbabb06ff59f7
parent f729eb529142b78aa03732a71f39e3a8c10d6188
author Jon Miranda <jonmiranda@google.com> 1498515095 +0000
committer android-build-merger <android-build-merger@google.com> 1498515095 +0000

Merge "Fix Folder text animation bugs." into ub-launcher3-dorval-polish
am: f729eb5291

Change-Id: Ifada9dc9eb4a7fd2c79f0a741d7998e9431a92bf