tree cba62d0d64153aa2169651696bc238591341d679
parent 935d37eff8474e41eece5e2a75c378e53283bcb1
parent b0e4a221c870bab59896ee8903087943beceb6f7
author Michael Jurka <mikejurka@google.com> 1414085221 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085221 +0000

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

* commit 'b0e4a221c870bab59896ee8903087943beceb6f7':