tree c47a435264644d13299fa7def58170d8a1218b46
parent 08ba9b1412f0bbf381b7069bf15e536ef5c4ba64
parent c9455b47402ff0f256d06c168e81faa2cdde6f71
author Martijn Coenen <maco@google.com> 1546864392 -0800
committer android-build-merger <android-build-merger@google.com> 1546864392 -0800

[automerger skipped] Export maximum number of fds/ints in a native_handle. am: c1cea05b5f -s ours am skip reason: change_id I0eafff70d3a7e4d732fe600a0052efb90108208d with SHA1 02debfa2df is in history am: 479b8544c6 -s ours am skip reason: change_id I0eafff70d3a7e4d732fe600a0052efb90108208d with SHA1 02debfa2df is in history
am: c9455b4740 -s ours
am skip reason: change_id I0eafff70d3a7e4d732fe600a0052efb90108208d with SHA1 02debfa2df is in history

Change-Id: I685d84c532ebd165914abb016e8c9d1601208680