OSDN Git Service

Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
authorRobert Shih <robertshih@google.com>
Fri, 25 May 2018 23:15:40 +0000 (16:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 May 2018 23:15:40 +0000 (16:15 -0700)
commit5ecf175573611798b53e2c7e0bacb35b12322f26
treeb5ef76abd1ecef1a7b1fc28d8a5352e426a7731d
parent3f3f1ebc17290ed4cbb7b347eb56c6aa269a1761
parent300ab58e9a8fa202a5ba6d6a69989d7b3d0d4a20
Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
am: 300ab58e9a

Change-Id: Ib8fd78e9d876ce986d443a8422330b7d69a44c10