diff options
| author | Colin Cross <ccross@android.com> | 2018-01-03 20:36:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-03 20:36:23 +0000 |
| commit | edabee6ff11999e8c87b4b926947b4a5fca81186 (patch) | |
| tree | f7d6e434bc9a5100c2256d41f8f8ad2cf3fea994 /README.android | |
| parent | c023f18d4f575d02f2db64346dc5f5968bb2f066 (diff) | |
| parent | 206294a6e5b7ea53651b910c848c9b2e6d80c0cd (diff) | |
| download | jacoco-edabee6ff11999e8c87b4b926947b4a5fca81186.tar.gz | |
Revert "Merge remote-tracking branch 'aosp/upstream-pull-525' into master" am: 37043f9e86 am: 8e7552aae7
am: 206294a6e5
Change-Id: Ie3bff7848f0eb705a1d776fe6f5c3680f332edb0
Diffstat (limited to 'README.android')
| -rw-r--r-- | README.android | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/README.android b/README.android index 21adf4d9..cad30c6c 100644 --- a/README.android +++ b/README.android @@ -14,5 +14,3 @@ is the list of the changes: 1) Remove the creation of JmxRegistration in org.jacoco.agent.rt.internal.Agent. 2) Change default OutputMode to none in org.jacoco.core.runtime.AgentOptions -3) Merge https://github.com/jacoco/jacoco/pull/525 -4) Update the build process to match #3: evaluate jacoco.properties, and add MANIFEST.MF |