| commit | 6f4f4b6884deb6e27352478ba54b925e11dc96ec | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jan 15 14:06:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 15 14:06:33 2021 +0000 |
| tree | 6b02f12e773eabf134015ac2c8b21c70031cad15 | |
| parent | 109538fe13a127147579aa7ade0fe444e4e26da9 [diff] | |
| parent | 7934073e6d27fe7254f95e64c8c7aac5d587e807 [diff] |
Merge "Fix CaptivePortalDataTest on R-" am: 4064d2da92 am: f748a34659 am: 7934073e6d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550715 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I45d764225af2857caa13e3ea0af660757c519f0f