tree 0e36eac4d80d6c154b8e89765f3d8cf801fd17e7
parent bab849cb4ca126d910955bb18f78b248d1c4ebd0
author allevato <allevato@google.com> 1591302670 -0700
committer Copybara-Service <copybara-worker@google.com> 1591302751 -0700

Automated rollback of commit b9fa276f5cf111fdfc2bc8766b9421cedba1b0a6.

*** Reason for rollback ***

Fixed the underlying issue with modulemap generation.

*** Original change description ***

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: 314793255