tree b0e26274389ca2d202201cf7b98d6ceb559d29a5
parent 48e934fc531f16a9aef3ef40ca8ef30b1a624644
parent c8ca2de7e4825a6d83514220283ded517fbd39a3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579719490 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579719490 +0000

[automerger skipped] Makefile change to allow VTS testing am: b9f27bbdad am: a15aee3613 am: c8ca2de7e4 -s ours
am skip reason: Change-Id I1b2dd68825af80095faf39aa7ebe0cfa0355f0ff with SHA-1 48e934fc53 is in history

Change-Id: Ie0f7698817d6101f77d790973aa35e25809cb740