tree a7a9c240d5a4b7f97a59fe08e830f5d5733f46e2
parent 6071c742d0c5dd46ace18825ab6cfbf7cd17c427
parent 0572cdd082155a424300e3d6e23ca2afaa91428b
author Michael Jurka <mikejurka@google.com> 1295426801 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295426801 -0800

am 0572cdd0: am bd00fff8: updating proguard flags for parallax changes

* commit '0572cdd082155a424300e3d6e23ca2afaa91428b':
  updating proguard flags for parallax changes