tree 1e68746fada846a367d81c4a24924e5ad30898af
parent 8af348770f962ed8d80b86caf3ac75cd08169a37
parent 2b76c2af7754a44b1134c4279e824fcb6f14c57c
author Bob Badour <bbadour@google.com> 1611445834 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611445834 +0000

Merge "Fix license_type. Licensed under CPL" am: 0a24b8d22d am: 2b76c2af77

Original change: https://android-review.googlesource.com/c/platform/external/emma/+/1556387

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cd5c9bbaa169d9b09f04c2cd57b5827f27951d1