Skip to content
Commit dcd93977 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Allow RNDIS and NCM to be enabled at the same time." am: 2836d8b7 am:... 

Merge "Allow RNDIS and NCM to be enabled at the same time." am: 2836d8b7 am: 9db81cad am: 677fbbbe

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559090

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia613275665e90be3e8fa00c0baa3d25823b61bd5
parents d7f32dc5 677fbbbe
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