tree 731ce09dd735c4bfe3adf2db0884dbb7befaebb6
parent 932a77919784b16533588884b8044668813f2828
parent f5095b3373511b88e3254b30c3bc3b99f2ea00f8
author Ruben Brunk <rubenbrunk@google.com> 1502221390 +0000
committer android-build-merger <android-build-merger@google.com> 1502221390 +0000

Merge "Fix double fd close in SharedMemoryParcelable." into oc-dr1-dev
am: f5095b3373

Change-Id: I5e27c40c343717c81361410890924a7240c3272b