From: nicolasroard <nicolasroard@google.com>
Date: Fri, 11 Oct 2013 20:00:53 +0000 (-0700)
Subject: am 7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad
X-Git-Tag: android-x86-7.1-r1~172^2~35
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=34c84972f83c3bb38c4308654ae2313bbd8aed17;p=android-x86%2Fpackages-apps-Gallery2.git

am 7835ea8c: Merge "Fix crash" into gb-ub-photos-carlsbad

* commit '7835ea8c351802dd6d4c7361fd24a72124a7897d':
  Fix crash
---

34c84972f83c3bb38c4308654ae2313bbd8aed17