Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02aa35f5 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 am: c9ef02ca
am: 31bed69b  -s ours

Change-Id: Ib639b95a1d277149dde27d0fa62033ec183dd5c3
parents 3100ac73 31bed69b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment