| commit | 5ecf175573611798b53e2c7e0bacb35b12322f26 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Fri May 25 16:15:40 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 25 16:15:40 2018 -0700 |
| tree | b5ef76abd1ecef1a7b1fc28d8a5352e426a7731d | |
| parent | 3f3f1ebc17290ed4cbb7b347eb56c6aa269a1761 [diff] | |
| parent | 300ab58e9a8fa202a5ba6d6a69989d7b3d0d4a20 [diff] |
Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev am: 300ab58e9a Change-Id: Ib8fd78e9d876ce986d443a8422330b7d69a44c10