tree ada9edc3e3997127764c9a7c46e757e3e55b4908
parent 00cdda008ddc5c4d4419e86b89904a241b191227
parent 62cc540c27210832f22255740b333a31b54c5a98
author Lorenzo Colitti <lorenzo@google.com> 1502297605 +0000
committer android-build-merger <android-build-merger@google.com> 1502297605 +0000

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

Change-Id: I91d5379a7c92fc4c4e602c33858d37c8747f77dd