tree a00ffacd443ba210ed6a5dcaf170fa57bb6f3951
parent 098babc7c80cebef1bc2c39802d805338410d3fe
parent a3bd97a019084035334cd18eae5485076d1282de
author Tim Murray <timmurray@google.com> 1477086591 +0000
committer android-build-merger <android-build-merger@google.com> 1477086591 +0000

Merge "healthd: move binder fd to not use EPOLLWAKEUP" into nyc-mr1-dev
am: a3bd97a019

Change-Id: Iec84824eed209ba0769cae03c9a1813eca9817bd