tree 04861d9daada3b9a4f18924d446b6ca617d6b429
parent af99964bc4f0e59ce13283c176dffde5a91356d7
parent bd00fff8dd8225df7d9879d94b5b184cf6e7accc
author Michael Jurka <mikejurka@google.com> 1295426706 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295426706 -0800

am bd00fff8: updating proguard flags for parallax changes

* commit 'bd00fff8dd8225df7d9879d94b5b184cf6e7accc':
  updating proguard flags for parallax changes