OSDN Git Service

resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Thu, 14 Jun 2012 22:26:35 +0000 (15:26 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 14 Jun 2012 22:26:35 +0000 (15:26 -0700)
commite0279d33974a095b12abfe33f3e0be84b5e7b7d0
tree371f07dcdde04701d587cb9751214b6d5b1d2b9f
parent295c2453f820709b8aa2a431940af1020d2de585
parentcf6f99e72089b61a8f495a3ae940d106f38e3377
resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp

Change-Id: I4d8d85960b5f0289ee442278db39b8f8c445d73e
src/com/android/gallery3d/photoeditor/EffectsBar.java
src/com/android/gallery3d/photoeditor/actions/EffectAction.java
src/com/android/gallery3d/photoeditor/actions/FaceTanAction.java
src/com/android/gallery3d/photoeditor/actions/FaceliftAction.java