Commit e49d624d 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 nougat-cts-dev
am: 3d65dc94 -s ours
am skip reason: subject contains skip directive

Change-Id: I9503f07df10185801fdc958e3e3f2d45b839d9aa
parents e13123f0 3d65dc94
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