tree aaf7fcb3b89eb1847a219275d53fc98c2f8306d3
parent 9050e3696c1b99cd6f4e52a234201778373ca0dc
parent ae0fcf1fb60de1d63fc1944111398497b655224b
author Geremy Condra <gcondra@google.com> 1363744899 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363744899 -0700

am ae0fcf1f: Merge "watchdog security policy."

* commit 'ae0fcf1fb60de1d63fc1944111398497b655224b':
  watchdog security policy.