Merge "Add new borders assets" into gb-ub-photos-arches

author nicolasroard <nicolasroard@google.com>

Thu, 29 Nov 2012 04:56:31 +0000 (20:56 -0800)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 29 Nov 2012 04:56:32 +0000 (20:56 -0800)
author nicolasroard <nicolasroard@google.com>
Thu, 29 Nov 2012 04:56:31 +0000 (20:56 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 29 Nov 2012 04:56:32 +0000 (20:56 -0800)
diff --cc src/com/android/gallery3d/filtershow/FilterShowActivity.java
Simple merge
author	nicolasroard <nicolasroard@google.com>
	Thu, 29 Nov 2012 04:56:31 +0000 (20:56 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 29 Nov 2012 04:56:32 +0000 (20:56 -0800)