OSDN Git Service

am 9a09d511: am 4c0aede4: Merge "Only show delete action when in secure camera mode...
authorztenghui <ztenghui@google.com>
Thu, 3 Oct 2013 19:19:32 +0000 (12:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Oct 2013 19:19:32 +0000 (12:19 -0700)
* commit '9a09d511ce26df0bb81a3fc3b61d68356c790860':
  Only show delete action when in secure camera mode.


Trivial merge