tree aee58926a4d6e0c486439c6cb01a69baa61cb6cb
parent 51cf3502f645e96a40ce8f2f65cc21279609b8af
parent 30caffc025aff450ebb354ee693174cc1732732b
author Colin Cross <ccross@android.com> 1377294141 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377294141 -0700

am 30caffc0: resolved conflicts for merge of a1af5cf6 to klp-dev-plus-aosp

* commit '30caffc025aff450ebb354ee693174cc1732732b':
  Handle policy reloads within ueventd rather than restarting it.