tree c6373b01931515beb1c8e61aff3c2908eeee963e
parent 7ba856e679e95896222ad5ad0afc60e32307933f
parent 3f26eb7e368b8301dba132d4363838e4b347d7e5
author Victor Chang <vichang@google.com> 1649329934 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649329934 +0000

Merge "Revert "Add package to Proxy2Test"" am: d6c5e7d143 am: f4b5c92b91 am: 3f26eb7e36

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2056088

Change-Id: I8d7259e39384bf744c2965861c414a3a5257ba3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>