Commit 15bbdce4 authored by Brett Chabot's avatar Brett Chabot Committed by android-build-merger
Browse files

Merge "Fix compatibility with Robolectric." am: 8845f321 

am: 5255f143

Change-Id: I696126dcfb4a9d0315c70f8f5dc3f1a1bbb7d66e
parents cf68d9fb 5255f143
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