Commit 73146ef4 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Gerrit Code Review
Browse files

Merge changes from topic "aospMockitoBackport" 

* changes:
  (Resubmit) Do not read Build.VERSION to allow non-standard Android distributions
  (Resubmit) Allow to share classloader via dexmaker.share_classloader system property
  Update dexmaker to current master (018d62e74446b2939a905fbc116cf816d4235846)
parents ab3dc038 7f861b4d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment