tree 485783f083504ab038ee9b417ed8495a7667c7b2
parent 11bf46c0cb7963ce103ce8d3f67eb743600e00e8
parent 2037f39bd3b5caeb8161928df59acff5cd92dd38
author nicolasroard <nicolasroard@google.com> 1381901661 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381901661 -0700

am 2037f39b: Merge "Fix crash "Gallery has stopped" popup occurs during print setup" into gb-ub-photos-carlsbad

* commit '2037f39bd3b5caeb8161928df59acff5cd92dd38':
  Fix crash "Gallery has stopped" popup occurs during print setup