tree aad6c6a693eeea291e79823e9790e281327f3ea9
parent c8c9045712e393e62a90341b130f757a6d2b645a
parent 2f81731e0986e21bd8407a8793112433795a2d2e
author Michael Jurka <mikejurka@google.com> 1379640156 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379640156 +0000

Merge "Improve parallax" into jb-ub-now-indigo-rose