tree 9c861e0f5e9faa4d7944157c5e3b59770a7e6654
parent bdceeb9eae2d74ae475b7a6f0776a6c1c2dcb713
parent 52b29c509bc3cc19fb9642ec6805248fd75db0b8
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586400600 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586400600 +0000

Merge "Include Android.mk when building S5 am: e8c9b7a632 am: 062224ac6a" into rvc-d1-dev-plus-aosp am: 52b29c509b

Change-Id: Iea7350080dadc7bffb060289bb3b14487bf105a5