tree 4f304f623cb4eb90f270a6ab0b38b6bd0597b986
parent 73b941f761270c71616fe44fa0727aa79345604c
parent 7a2cb299a0fffba8ad4eb044a57c37d0e42d380b
author Adrian Roos <roosa@google.com> 1406294558 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406294558 +0000

am 5de758d3: am f8a01f5f: am 6468d5c2: Merge "Restart trust agents when updated or when they are dead" into lmp-dev

* commit '5de758d3868b036f5067ad9f86ee7b02331e4818':
  Restart trust agents when updated or when they are dead