commit | 31df6688763a135c0d111bf60dbeac6ed7cc0786 | [log] [tgz] |
---|---|---|
author | Stacie Mashnitskaya <mashnitskaya@google.com> | Wed Jul 22 21:12:33 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 22 21:12:33 2020 +0000 |
tree | cc9c2720c4f8eec344038e755ccfff3f2c2ee7b3 | |
parent | cc55aa1830e8874e0184dc7e226fb36fd233ce3c [diff] | |
parent | d471d3427784bd8aeb541075b01dc92159252de8 [diff] |
[automerger skipped] [RESTRICT AUTOMERGE] Fix xml merge issue CTS test for Android Security b/112005441 am: 200c552192 -s ours am: d471d34277 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12197205 Change-Id: I9b889def241f15ab4f52ec4e1bdc097df17bc367