Commit 558f0582 authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

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

Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use mTelephonyManager to test the testHasCarrierPrivileges()" into nougat-cts-dev am: 3d65dc94 -s ours am skip reason: subject contains skip directive" into nougat-mr1-cts-dev
parents e13123f0 e49d624d
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