Commit a344dd5f 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: I6b909bd2eb6c6b203a78a21d290ad7f9b1701a5d
parents 164a94be 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