tree 95a315c8594bcddbdd41f1209c37d7597e408388
parent a648cac07f4882d0367827cf41a4ffe1b4f1ba29
parent 873c70a8fd4808f1d0af583bfa3fcc67fc0abea0
author Josh Gao <jmgao@google.com> 1533941195 -0700
committer android-build-merger <android-build-merger@google.com> 1533941195 -0700

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

Change-Id: I2562db3d476face06215e22ecc476c60827ebdd1