Merge "New Shimmy" into gb-ub-photos-denali

author Doris Liu <tianliu@google.com>

Sat, 1 Mar 2014 02:48:25 +0000 (02:48 +0000)

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

Sat, 1 Mar 2014 02:48:25 +0000 (02:48 +0000)
author Doris Liu <tianliu@google.com>
Sat, 1 Mar 2014 02:48:25 +0000 (02:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 1 Mar 2014 02:48:25 +0000 (02:48 +0000)
diff --cc src/com/android/camera/ui/ModeListView.java
Simple merge
author	Doris Liu <tianliu@google.com>
	Sat, 1 Mar 2014 02:48:25 +0000 (02:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 1 Mar 2014 02:48:25 +0000 (02:48 +0000)