tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent d94d335ba010d4bac5e780073b73b6f28b267e74
parent da38055ab3b1492c030c4cff96ecb91d78749896
author Michael Jurka <mikejurka@google.com> 1392411008 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411008 +0000

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 'da38055ab3b1492c030c4cff96ecb91d78749896':