OSDN Git Service

am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb...
authorztenghui <ztenghui@google.com>
Thu, 3 Oct 2013 16:04:23 +0000 (09:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Oct 2013 16:04:23 +0000 (09:04 -0700)
commit9a09d511ce26df0bb81a3fc3b61d68356c790860
tree3a64f35c7ba42074007758cfda80232cc7458a77
parentcd324a25d3c97a7fc4bc22c2ab12408d3d5e2ac2
parent4c0aede4ea37f8fad98a40ec4d28028f338591bd
am 4c0aede4: Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad

* commit '4c0aede4ea37f8fad98a40ec4d28028f338591bd':
  Only show delete action when in secure camera mode.