tree d141520f726462e268156336a4e97ab3e439fb38
parent 1a4bc908f278bf10f46fa0c6348b068efee2844d
parent 3752ae8474e376e1bdcc299390212697a8a793be
author Tom Cherry <tomcherry@google.com> 1499307800 +0000
committer android-build-merger <android-build-merger@google.com> 1499307800 +0000

Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master
am: 3752ae8474

Change-Id: Id88c3f665131cafd5d7d3d8fc0159997d92130f0