OSDN Git Service

resolved conflicts for merge of 5b188c94 to gb-ub-photos-bryce
authorBart Sears <bsears@google.com>
Tue, 18 Dec 2012 20:58:15 +0000 (12:58 -0800)
committerBart Sears <bsears@google.com>
Tue, 18 Dec 2012 20:58:15 +0000 (12:58 -0800)
commit86ac467628c063e6955e83df4f44e0c7aa862181
tree4fc045411938ad2763b105365ba2c317f502585e
parent8b18f0379dcc9991c9596a32ce172b09d9a4aaad
parent5b188c94f5895cd166fc29def1e5295498e298c9
resolved conflicts for merge of 5b188c94 to gb-ub-photos-bryce

Change-Id: I0b39e54323c8f2ce67816ec223acf72cfacbd191
src/com/android/gallery3d/filtershow/FilterShowActivity.java
src/com/android/gallery3d/filtershow/PanelController.java