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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib11fbb6cecb6513fb023e8df655246585df42a6f