| commit | 200c5521920d3857f3bd5de8a5b5cd718440a800 | [log] [tgz] |
|---|---|---|
| author | Stacie Mashnitskaya <mashnitskaya@google.com> | Fri Jul 17 20:37:37 2020 -0700 |
| committer | Stacie Mashnitskaya <mashnitskaya@google.com> | Mon Jul 20 19:50:26 2020 -0700 |
| tree | 2096e8d37ff1df72b980e46f08ae4fd17cc70832 | |
| parent | 83ddb78c120b44a22c6ac31f11b2e0e89746cf5d [diff] |
[RESTRICT AUTOMERGE] Fix xml merge issue CTS test for Android Security b/112005441 Fix merge issue that is causing problems Bug: 112005441 Bug: 137950491 Test: Ran the new testcase on android-10.0.0_r1 with/without patch Change-Id: Idd9d234be37785086bceffd4b6aefda40baa9d16 Merged-In: I554824b4a07664d2b607e4f3c9743931ced64fed