Merge "[conflict] Merge "Make golden path relative to $ANDROID_BUILD_TOP" into tm-qpr-dev am: 7f4958c46e am: 8a30b9a087"
This commit is contained in:
committed by
Android (Google) Code Review
commit
480598ace8