tree 5647393e56ea1730c95377371b6e6e1e5c54bf97
parent 1406ab128131fc7924d7cee47d62ba1e2167ad43
parent 334cff9cca0340b5709b5bb9d12d2b9b7c6e65c2
author Kelvin Zhang <zhangkelvin@google.com> 1623022956 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623022956 +0000

Merge "Add caremap proto target for release tools" am: 3ac7598c61 am: 334cff9cca

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1725932

Change-Id: If506728b107a8c9db20d47f9785499783099198f