Skip to content
Commit 607f74b3 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 dependencies" 

am: c06dbc11  -s ours

Change-Id: Idfc34008bf7d9c636ee67fed3f07552be688052d
parents a22fbf45 c06dbc11
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