tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 2ca8c77b803e50ec4daa76ffc64cc27346d508b3
parent 090f4149cd7c0cc5fb9a986bc3df88fd3c0a5a71
author Michael Jurka <mikejurka@google.com> 1392410131 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410131 +0000

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

* commit '090f4149cd7c0cc5fb9a986bc3df88fd3c0a5a71':