tree 9c861e0f5e9faa4d7944157c5e3b59770a7e6654
parent a66621e527de216e183385f3bd73ee4a94effab7
parent e8c9b7a63240721c9a0d9df0e1852f4682a72f9f
author Cyan_Hsieh <cyanhsieh@google.com> 1586397953 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586397953 +0000

Include Android.mk when building S5 am: e8c9b7a632

Change-Id: Idad0cd8facc9cbe37fdabda2a99e91d3bf6cd1dd