tree fc8be8bb13bd9bd4100a4035d2fd09bad4e510e3
parent 970c0bdd33978839857d05adc98d014dfdd8ef07
parent c4870f4c07d085ed6b9f220c2f04ef8ea5a1cd6e
author John Hoford <hoford@google.com> 1369266423 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369266423 -0700

am 4d25d129: Merge "fix ellipse logic for portrait" into gb-ub-photos-bryce

* commit '4d25d129d1c9f92033382e12260d3f40521cf3fd':
  fix ellipse logic for portrait