commit | 4682abaaa6f714d7bcfcf861af77b1b3c3c64281 | [log] [tgz] |
---|---|---|
author | Nick Kralevich <nnk@google.com> | Wed Apr 27 13:49:59 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 27 13:49:59 2011 -0700 |
tree | 303b6f90d52df7435ac6f629772d83dbb26ace56 | |
parent | ee07501b25e088b24f87b691bf14756a94d2941e [diff] | |
parent | b0d0e260bd6118959fa0e2d3c84037b3e0178551 [diff] |
am b0d0e260: resolved conflicts for merge of 2baeb898 to honeycomb-plus-aosp * commit 'b0d0e260bd6118959fa0e2d3c84037b3e0178551': Fold uevent message origin checking from init into libcutils.