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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7e6e4698f80bc70112e9338c5c5ff27cbd248ce
parents 9dd3a7b6 9db81cad
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