OSDN Git Service

Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos...
authorDoris Liu <tianliu@google.com>
Fri, 4 Oct 2013 00:08:20 +0000 (00:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 4 Oct 2013 00:08:20 +0000 (00:08 +0000)
commitb0fbd5437cc67ce10e8f4b2a7318d4cc97110976
tree87260a8c453630ec06a076f3cb0eb4bebdf7109c
parent7ba4a88eb78fc41717275de25748f5cf17915f5b
parentdba16ae7d0aee0c3984df68b5787a0d0a7cd6f50
Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad
src/com/android/camera/CameraActivity.java