[conflict] Merge "Make golden path relative to $ANDROID_BUILD_TOP" into tm-qpr-dev am: 7f4958c46e am: 8a30b9a087

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291803

Change-Id: Idc54144269751c675f1719e3e9ab6713be312154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jay Aliomer
2022-12-01 02:35:20 +00:00
committed by Ilya Matyukhin

Diff Content Not Available