tree a58d54a6615ebdce398d5cef2a74e59bcabf639a
parent 63d46d02018979802733dde735a8ea5fca36ed05
parent 4b186225c685bca13dbfee641f9939a004294d37
author John Hoford <hoford@google.com> 1350000662 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350000662 -0700

am a4ccb4af: Merge "fixed manta image size and double FX issue" into gb-ub-photos-arches

* commit 'a4ccb4af475fbabf637dd48bf68db449ea7c8197':
  fixed manta image size and double FX issue