tree 3b529bcbfe2a7fa2346f387b41030216b06a6b28
parent 9f738088107d5fd15f934eba9c545d2ed2b6e941
parent 4dee51a8037122247583e4a243414ea7f6b4c415
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1692221398 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692221398 +0000

[automerger skipped] Merge "Update codelab system app to use native code" into main am: 481b4c64f4 am: 48279db136 am: 34537993fb am: fda88db861 am: 4dee51a803 -s ours

am skip reason: Merged-In I1532d89ef185c584d3cc76c0541a0f47e622e3fb with SHA-1 a2fa967af0 is already in history

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

Change-Id: I17db1c2e7b66a677f36811cb4270db0fa5c91740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>