tree 303b6f90d52df7435ac6f629772d83dbb26ace56
parent ee07501b25e088b24f87b691bf14756a94d2941e
parent b0d0e260bd6118959fa0e2d3c84037b3e0178551
author Nick Kralevich <nnk@google.com> 1303937399 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303937399 -0700

am b0d0e260: resolved conflicts for merge of 2baeb898 to honeycomb-plus-aosp

* commit 'b0d0e260bd6118959fa0e2d3c84037b3e0178551':
  Fold uevent message origin checking from init into libcutils.