tree 65249f1b1b4dbb3d564542331b17066e14f7253e
parent 3f0e12a85f05e651e58396df2e0bd1c99fe378c6
parent 623dc24c71728ca2cdda2e7a884786efaeddfb56
author Treehugger Robot <treehugger-gerrit@google.com> 1604607447 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604607447 +0000

Merge "cargo2android: reorder TEST_MAPPING statements" am: 7534ce72da am: 623dc24c71

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

Change-Id: I5b8fe1b7c09a88487d8e28c5cf12bbe797a782aa