commit | 7ef5d074520413445a208df93004c1cac90844b5 | [log] [tgz] |
---|---|---|
author | Dan Willemsen <dwillemsen@google.com> | Mon Jan 06 14:03:56 2020 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jan 06 14:03:56 2020 -0800 |
tree | eda755442ca91e2c4393926871e0297a03a19040 | |
parent | ea83ab5eccf7d29f0ee05315c2eddd133c6b4162 [diff] | |
parent | a62862bd08c5af4532182171660348ee560fc096 [diff] |
Merge "Allow EMMA_INSTRUMENT_FRAMEWORK during ninja" am: a62862bd08 Change-Id: I324c0019f900b502f3d557f6c215bab010eda7f6