tree d1ca88d7bef60a4ac8e70481861ad0e024555f9f
parent 028d2f5782f3701a56385eb8674ae186af3eca88
parent 882a0146c736c014ed0dccbe122ab2d260eb3322
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582060229 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582060229 +0000

Fix the build after rebase. am: 7fc14e3ea2 am: 882a0146c7

Change-Id: I7f95be41b16ac7f9121635eef14a119c640d7056