Merge "Updates newly centered photos in FilmStrip after a delete." into gb-ub-photos...

author Erin Dahlgren <edahlgren@google.com>

Tue, 1 Oct 2013 15:49:59 +0000 (15:49 +0000)

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

Tue, 1 Oct 2013 15:50:00 +0000 (15:50 +0000)
author Erin Dahlgren <edahlgren@google.com>
Tue, 1 Oct 2013 15:49:59 +0000 (15:49 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 1 Oct 2013 15:50:00 +0000 (15:50 +0000)
diff --cc src/com/android/camera/CameraActivity.java
Simple merge
author	Erin Dahlgren <edahlgren@google.com>
	Tue, 1 Oct 2013 15:49:59 +0000 (15:49 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 1 Oct 2013 15:50:00 +0000 (15:50 +0000)