Skip to content
Commit b71ec00c authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "Fix some broken tests in frameworks-net with native dependencies" am:... 

Merge "Fix some broken tests in frameworks-net with native dependencies" am: 1fd2eb62 am: 72a20c39 am: c08dcf6a
am: 41be8131  -s ours

Change-Id: Ib5c464452fc7e50e076512ef9c7fd5323874b693
parents acae4ad5 41be8131
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