tree a386688788b983d162a544f1acdd88bcd31a2f9c
parent b18b12176b347031492fa7aa7342f59a6531f563
parent 1fb65f179887f4f3227ea32b368e309434eb4ac0
author Josh Gao <jmgao@google.com> 1533942761 -0700
committer android-build-merger <android-build-merger@google.com> 1533942761 -0700

Merge "MemoryIntArray: track the owned file descriptor in a PFD." am: dccbfca194 am: 873c70a8fd
am: 1fb65f1798

Change-Id: I4c4e372f3122cd41b8b6831abf8e215e972dd893