tree 6ee595868ef4212f2fc6c51a1cf12616803a9d3d
parent 68ab4116e26ee29b307f0bf25e6e9af472a5da36
parent 713afa70e5c836c93c79f78dc9a36b1847f7d541
author Sunny Goyal <sunnygoyal@google.com> 1466531545 +0000
committer android-build-merger <android-build-merger@google.com> 1466531545 +0000

Merge \"Maintaining separate alpha for x and y translations\" into ub-launcher3-calgary
am: 713afa70e5

Change-Id: I6b2df60cd994b466b1580a521d3b72326f5403f5