tree f8323a88e2e99e5f6e035908ba9e76c8cca6d684
parent feaa14f2004ef991140418c99b891a36424d1564
parent e8c9b7a63240721c9a0d9df0e1852f4682a72f9f
author Cyan_Hsieh <cyanhsieh@google.com> 1586397946 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586397946 +0000

Include Android.mk when building S5 am: e8c9b7a632

Change-Id: Ieb24bc7be1ad27743da74c4ed17bc5d53b26795d