| commit | 781c3491f71788b190daf42f6c631bdc9fa935b2 | [log] [tgz] |
|---|---|---|
| author | Mohannad Farrag <aymanm@google.com> | Fri Jan 19 12:04:41 2024 +0000 |
| committer | Mohannad Farrag <aymanm@google.com> | Fri Jan 19 12:14:47 2024 +0000 |
| tree | f72b06e7ce587813e073e9c5f031a75bec1b2830 | |
| parent | 5ab8eee2f1dd6a40a5bb6932f5ea6b7de5f0b5b5 [diff] |
Remove base divergence * Removed divergence by executing `git checkout aosp/upstream-import -- files`. * This was only possible because of aosp/2917946 and b/303040212 Test: m && atest NetHttpTests Bug: 304217500 Change-Id: Iab52d924c443c867650bf556121cdc0c70cbf934