tree 5c1ce4fae26b9fc2d8367505a1df29d082459cc0
parent daf01a0a1fe852ecd5942095a11e699a2cb91deb
parent ad86c0342e7a39386efbeec522ba56f3e3bec997
author Lorenzo Colitti <lorenzo@google.com> 1502297236 +0000
committer android-build-merger <android-build-merger@google.com> 1502297236 +0000

Merge "Merge "Dup fds to stop finalizers from invalidating them." into nougat-mr1-cts-dev am: bfabfe75f9" am: 1e524c5db2
am: ad86c0342e

Change-Id: Ib57c68207e2f9f2cdecefb460f4d3731da04d858