tree c218e8a82578541a9bd03c9744b72cc6f22ddf26
parent 1c4489a95ebc326dd8d046b2175c885fe5017e14
parent 42a2b43784d8ef1d7fdf036c7e2c14f5348b412d
author Treehugger Robot <treehugger-gerrit@google.com> 1646775353 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646775353 +0000

Merge "Move comment to license_note" am: 6cb79dee0c am: 1702ecd48a am: 42a2b43784

Original change: https://android-review.googlesource.com/c/platform/external/protobuf/+/2007805

Change-Id: I8cce98457d78310cd077c26c67572423fda5b543