tree f6e7156226a779c32fe5ccaf0fd4d6784c19ebbe
parent ede11beb9c3a05dad2628809641c16398e3fbeb0
parent dd334be92c5513a06c809ee3ea25e411dfad0589
author zafir <zafir@google.com> 1437157406 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437157406 +0000

am dd334be9: Camera M permissions: lockscreen improvements

* commit 'dd334be92c5513a06c809ee3ea25e411dfad0589':
  Camera M permissions: lockscreen improvements