| commit | edb69ed9fc72138471df6f6d787ed25fa41c45b3 | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Fri Feb 14 20:58:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:58:38 2014 +0000 |
| tree | 4e7ec699006b78d116024621f74302c250c1cfaa | |
| parent | f83eb6c3ea7c1af869dd6847530b4f6e86e02568 [diff] | |
| parent | b0e4a221c870bab59896ee8903087943beceb6f7 [diff] |
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':