tree e4c7126dcd6a60b15790e95a04ae3c5ede48f34c
parent 9da7bb7584164a5b477c44cac2ae178d14249fce
parent 1486557d10f9969ef31b65e4312bd00b1a6f02ae
author Christopher Tate <ctate@google.com> 1459463312 +0000
committer android-build-merger <android-build-merger@google.com> 1459463312 +0000

Merge "Handle interaction of Bundle.hasFileDescriptors() with removal" into nyc-dev
am: 1486557

* commit '1486557d10f9969ef31b65e4312bd00b1a6f02ae':
  Handle interaction of Bundle.hasFileDescriptors() with removal

Change-Id: I3e1d35c5fbd6ad2356abe61309f8b6797f3fbbba