tree bd3c456cb698649c2781edc85fee0a84f6c79890
parent 8888aedc1f847e5db5b63d45fbe4d501f133baa2
parent 7990701a145e4a4350182413ea0c998d34331b79
author Dianne Hackborn <hackbod@google.com> 1476391667 +0000
committer android-build-merger <android-build-merger@google.com> 1476391667 +0000

Merge "Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev am: 33e56a9e1f am: d3ad5ce147
am: 7990701a14

Change-Id: Ib2f4c585628cb469975dbe41a85bfdcb52e58857