From: Doris Liu <tianliu@google.com>
Date: Mon, 13 May 2013 18:32:20 +0000 (+0000)
Subject: Merge "New count down beeps." into gb-ub-photos-bryce
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~8^2^2~8^2~35
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=25d69c11;p=android-x86%2Fpackages-apps-Camera2.git

Merge "New count down beeps." into gb-ub-photos-bryce
---

25d69c11831fabf8f4e474aaf17b05dd001979ce