tree 59defc0129414cf43b4eb38b8bf7e1b283161a5c
parent 49a6dc96fde350d9348b20a39149f8371f317734
author ahumesky <ahumesky@google.com> 1590609960 -0700
committer Copybara-Service <copybara-worker@google.com> 1590610052 -0700

Automated rollback of commit 9906c5c4cd1124a4291461fb472685ad7d88580e.

*** Reason for rollback ***

b/157557521

*** Original change description ***

Preserve direct fields when merging ARC and non-ARC compilation contexts after Objective-C compilation.

RELNOTES: None.
PiperOrigin-RevId: 313448572