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

Browse Source

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: I6834a26302417a2545b9d76e8b37b78d0797753b

...

This commit is contained in:

Anton Hansson

2021-09-01 09:45:47 +00:00

committed by Automerger Merge Worker

parent af49de1dc5 0df6fdedce

commit 35a8ef22a4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available