tree 10da860fcff71886af91d082e31f0e1917926848
parent fb5aabf183e059da70b931f3d2f9ec8d11b8cd04
parent c6ab204836f31c568731b0879ac20b70c38998fb
author Michael Jurka <mikejurka@google.com> 1414566107 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566107 +0000

am c6ab2048: 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 'c6ab204836f31c568731b0879ac20b70c38998fb':