Commit 5c3c9098 authored by yinxu's avatar yinxu Committed by android-build-merger
Browse files

Merge "Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use... 

Merge "Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use mTelephonyManager to test the testHasCarrierPrivileges()" into nougat-cts-dev am: 3d65dc94 -s ours am: 558f0582 -s ours
am: 43a605cf -s ours
am skip reason: subject contains skip directive

Change-Id: Icff4b47eec9aa81a426ab21facb5cff9e913b036
parents c26e344e 43a605cf
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment