tree 70004ac1aadec032414ac4a9ef8e404bfca46079
parent f099eb0bf4c0fdee5c4708d48ce0134fbf0d1249
parent 16205da30e223368b31c68b7d76ac3d52f940c88
author Michael Jurka <mikejurka@google.com> 1380590893 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380590893 +0000

Merge "Restore parallax even if Google Now isn't present" into jb-ub-now-indigo-rose