tree de12cac6fe78c7eb69f2a1a5e91ef42b91901479
parent 6dadf64d9d30174c6831d17478aa124df6df54a7
parent 140fe6de276e1f7981d1a8093ca04288645f8332
author Nick Kralevich <nnk@google.com> 1393000971 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393000971 +0000

am 140fe6de: am 35e45e3e: Merge "Move SELinux diag_device policy to userdebug/eng."

* commit '140fe6de276e1f7981d1a8093ca04288645f8332':
  Move SELinux diag_device policy to userdebug/eng.