commit | 58e0f20f853b075378ede26b65642f6e77af6934 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 06 22:16:49 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 06 22:16:49 2020 +0000 |
tree | eda755442ca91e2c4393926871e0297a03a19040 | |
parent | b089fba01f4a69d80d5c0be9ffced72f85ca8ee5 [diff] | |
parent | 7ef5d074520413445a208df93004c1cac90844b5 [diff] |
Merge "Allow EMMA_INSTRUMENT_FRAMEWORK during ninja" am: a62862bd08 am: 7ef5d07452 Change-Id: I0135eebbc8576bc314779e5639109225334dabcd