tree c62cb2e966a3466d37d23ed0ebfb627f6b103549
parent e4b1fd58c335f5b27318baf2128fe0375c4fccde
parent cc0086e4a4331762d81f17f7dcf6e55b4820193a
author Michael Jurka <mikejurka@google.com> 1380591092 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380591092 -0700

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

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