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

Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native... 

Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am: c06dbc11  -s ours
am: 607f74b3  -s ours

Change-Id: I78b9a3639321a15a26eff3abd4c80a9d84d9229c
parents db554dfd 607f74b3
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