| commit | 203c73859137cdd4cca450bb6cc1cb7573fe4f85 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Fri May 25 16:26:00 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 25 16:26:00 2018 -0700 |
| tree | ee5ceb6278946c7adc743cdd8e3d75acfecd96f6 | |
| parent | 3a3c2157da4d22f857885cc907cf6988e0ec70ed [diff] | |
| parent | 5ecf175573611798b53e2c7e0bacb35b12322f26 [diff] |
Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev am: 300ab58e9a am: 5ecf175573 Change-Id: Iaecb78eca49f32d155ea856630d6299b8604d8fc