tree c62cb2e966a3466d37d23ed0ebfb627f6b103549
parent 5a4cb3fa6b5794bc61a7da0990c5145e8e9e47ab
parent 1970614d0980699a6858a098dd1e13e65664ab47
author Michael Jurka <mikejurka@google.com> 1380590990 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380590990 -0700

am 1970614d: Merge "Restore parallax even if Google Now isn\'t present" into jb-ub-now-indigo-rose

* commit '1970614d0980699a6858a098dd1e13e65664ab47':
  Restore parallax even if Google Now isn't present