Skip to content
Commit 30d2c140 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

Change-Id: I6b2486c69af1a05f8282a0d648403522adf2b471
parents 53a0c205 cf7aa7c0
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