OSDN Git Service

am 309cd179: am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip...
authorDoris Liu <tianliu@google.com>
Fri, 4 Oct 2013 04:27:23 +0000 (21:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Oct 2013 04:27:23 +0000 (21:27 -0700)
commit5e233f829888b2a4bedbf30b57cce400539fe1eb
tree7713c938579a527325ff966b871c1269d1fecce9
parent2e2467c3f87f01aa673ef987fa11492293d18c17
parent309cd179b821f63b25e5ebae556b38daabab1708
am 309cd179: am b0fbd543: Merge "Prevent picture taking via volumn key in filmstrip mode" into gb-ub-photos-carlsbad

* commit '309cd179b821f63b25e5ebae556b38daabab1708':
  Prevent picture taking via volumn key in filmstrip mode