Merge "Camera: Fix duplicated code."
authorEino-Ville Talvala <etalvala@google.com>
Mon, 7 Jan 2013 18:27:16 +0000 (10:27 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 7 Jan 2013 18:27:16 +0000 (10:27 -0800)

Trivial merge