From: Sascha Haeberling <haeberling@google.com>
Date: Tue, 20 Aug 2013 17:14:35 +0000 (-0700)
Subject: am 778acca3: am 7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad
X-Git-Tag: android-x86-7.1-r1~114^2~209
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b3ab5bda;p=android-x86%2Fpackages-apps-Gallery2.git

am 778acca3: am 7a4412d1: Merge "Prevent NPE." into gb-ub-photos-carlsbad

* commit '778acca3b6592ab5bc150f726b68e4af24d3c7e4':
  Prevent NPE.
---

b3ab5bda54ee05fb5622d6d475132d76d7f07745