Commit 56d209c7 authored by yinxu's avatar yinxu Committed by android-build-merger
Browse files

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

Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use mTelephonyManager to test the testHasCarrierPrivileges()" into nougat-mr1-cts-dev am: e13123f0 -s ours
am: fde438c3 -s ours
am skip reason: subject contains skip directive

Change-Id: I7e8d0a8720af6acb303cf1fef0a62b7a1d9c7b4d
parents 962aa828 fde438c3
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