From: John Reck <jreck@google.com>
Date: Thu, 16 May 2013 20:59:20 +0000 (-0700)
Subject: am 80835b0a: am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce
X-Git-Tag: android-x86-7.1-r1~64^2~10^2~71
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2c596d7f5988c942774fb9f8044162b4149f9ab2;p=android-x86%2Fpackages-apps-Gallery2.git

am 80835b0a: am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '80835b0aa14ad477adf3f23b69b2bf7c83fe0c20':
  Fix reset
---

2c596d7f5988c942774fb9f8044162b4149f9ab2