tree cf9fd322f1286cc78c705280fddbdbd0cf66b8a3
parent 0bbe38ed1e84f963c5d7502fed6142e8ebfcf449
parent fe0737868b509cc003bebb65fd2a3e6c672d1ff7
author Josh Gao <jmgao@google.com> 1562706698 -0700
committer android-build-merger <android-build-merger@google.com> 1562706698 -0700

Merge "minadbd: delete unnecessary fdevent.h include." am: e1701454b2 am: 32aeca8e78
am: fe0737868b

Change-Id: I44b9dc695019c1ac6dcd0a08b6102e7251c61142