OSDN Git Service

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


Trivial merge