Skip to content
Commit 9db81cad 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 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e9dc75ac6430b70f28ddc974937a4f0d443bd28
parents 132a5027 2836d8b7
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