OSDN Git Service

am 5e233f82: am 309cd179: am b0fbd543: Merge "Prevent picture taking via volumn key...
authorDoris Liu <tianliu@google.com>
Fri, 4 Oct 2013 04:30:14 +0000 (21:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Oct 2013 04:30:14 +0000 (21:30 -0700)
commit2294bfccdf07dc5c641a13b3c6d653d4dcc0412b
tree64c16bed80d50d048bdffb74da1c87ad3e6e2ec4
parente65a190d2635c8a5c7ce8fd1b4b14f33bbbe5cc1
parent5e233f829888b2a4bedbf30b57cce400539fe1eb
am 5e233f82: am 309cd179: am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad

* commit '5e233f829888b2a4bedbf30b57cce400539fe1eb':
  Prevent picture taking via volumn key in filmstrip mode