Skip to content
Commit c9ef02ca 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
am: 082a9fa1

Change-Id: If6ad00b1ee146f73ee62a5a7d5e3992ee29b6fd2
parents 86e04cb3 082a9fa1
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