tree fb528438dad2739ff3b1791616372778f3f38489
parent ff54c5894224f23d547b241c405b052212721584
parent a87809f9d13a3d39bf2202303b912019e8107c1b
author Dake Gu <dake@google.com> 1488916220 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1488916220 +0000

Merge "Reenable parallaxTest"