Commit 1eba370d authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

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

Merge "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" into oreo-mr1-cts-dev
parents c26e344e 5c3c9098
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