Skip to content
Commit 7467d044 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Don't include mockito in frameworks-base-testutils" am: f9246427 am: cf7aa7c0 

am: 30d2c140  -s ours

Change-Id: Id53b8f79a485f48d942d592d4ab6192f8545e356
parents 6b93e393 30d2c140
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment