Commit c26e344e 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 oreo-cts-dev am: 28da20b2 -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev
parents 5fe340ea 31919c8b
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