From: nicolasroard <nicolasroard@google.com>
Date: Thu, 12 Sep 2013 16:21:26 +0000 (-0700)
Subject: am 7a3df681: am 3f9e5504: Merge "Replace add preset icon" into gb-ub-photos-carlsbad
X-Git-Tag: android-x86-7.1-r1~114^2~148
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ad349a5aea13ba7fa864f2ca68616667fc858d5;p=android-x86%2Fpackages-apps-Gallery2.git

am 7a3df681: am 3f9e5504: Merge "Replace add preset icon" into gb-ub-photos-carlsbad

* commit '7a3df681bc6e85e9ad9bd47ec7a811d4a1d4a2f1':
  Replace add preset icon
---

3ad349a5aea13ba7fa864f2ca68616667fc858d5