tree e3a1726d016ccd4d232ef3c32a2d36ad822ad25c
parent d6f247be465060c28be6018c9dee4b098d589eba
parent 9eb37145df8adfb0bd68e9023342f5c7a4d12d31
author John Hoford <hoford@google.com> 1369152646 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369152646 -0700

am a285bc13: Merge "fix TinyPlanets Filter landscape crash" into gb-ub-photos-bryce

* commit 'a285bc130ff1175c60085410f317e90f6443c39b':
  fix TinyPlanets Filter landscape crash