tree deeb6fd303bd9ce95416396150e4604815c8e43c
parent 295fc250b671134a21ecf5b3401f83220be8c9f7
parent 7c0923a2be4c1b639732c4bddc9c90626d4ce9ab
author Anton Hansson <hansson@google.com> 1630488732 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630488732 +0000

[automerger skipped] Merge "Add sdk extension version info to prop templates" am: cf4b9a604d -s ours am: 7c0923a2be -s ours

am skip reason: Merged-In Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc with SHA-1 48c492ed9f is already in history

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

Change-Id: I98bed3db29380c7b34cd0aa106f85be1f181af2e