tree 8e96b3ca2fb1a43645b0b9c1527223faf7e3acf7
parent 2c18c8e34d0c06d95f612e865badc082a2cff0e1
parent 4dbaef024676469e60654814e7f8ee46e2943638
author Tony Wickham <twickham@google.com> 1441303948 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1441303948 +0000

Merge "Change addParallaxOffset() to setParallaxOffset() in CropView." into ub-launcher3-master