Skip to content
Commit 5ecf1755 authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev 

am: 300ab58e

Change-Id: Ib8fd78e9d876ce986d443a8422330b7d69a44c10
parents 3f3f1ebc 300ab58e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment