From: Michael Kolb <kolby@google.com>
Date: Mon, 11 Mar 2013 22:36:03 +0000 (-0700)
Subject: am 54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce
X-Git-Tag: android-x86-7.1-r1~64^2~10^2~11^2~382
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ab608128;p=android-x86%2Fpackages-apps-Gallery2.git

am 54c1256f: Merge "Spring cleaning" into gb-ub-photos-bryce

* commit '54c1256ffd0f578f4b33680c54d50ab6901d9098':
  Spring cleaning
---

ab60812856e3181e3e1748259b1c1b155de4a1c8