tree 919e2768b4becf573684b965a18c25ab0f27c783
parent 65a4a4ccbedcaea8ecf12c89cbbe43d3ff08018f
parent f322c46ffada5733e0b59114b1624a3d2bd43478
author Treehugger Robot <treehugger-gerrit@google.com> 1617844771 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617844771 +0000

Merge "Fix cargo2android's license block preservation" am: dddc6e0873 am: 47aad36a67 am: f322c46ffa

Original change: https://android-review.googlesource.com/c/platform/development/+/1663858

Change-Id: Ief2d45313570bb8f402d3437db1fb1e6b1a58a14