Commit 2cc8f169 authored by yinxu's avatar yinxu Committed by android-build-merger
Browse files

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

[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

Change-Id: I53d77c023bfaa7baaa314e61a4fa9b2ee7b25e4b
parents a344dd5f 28da20b2
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