commit | db94cf9c99484d8eda2bcb67b7fc1afa13ddd50c | [log] [tgz] |
---|---|---|
author | Aaron Huang <huangaaron@google.com> | Tue Apr 06 14:03:42 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 06 14:03:42 2021 +0000 |
tree | 03b50afb3114e2a55c2cc2e3f9635bd44b66f318 | |
parent | bcb4204697868b605758dfab37b13f383fdc16a9 [diff] | |
parent | 4a14451368e5a47e95aa952edb5dad3b1def57cc [diff] |
[automerger skipped] Merge "Expose Context#PAC_PROXY_SERVICE as module lib API" am: 248a42ca89 am: 06007f0302 am: 4a14451368 -s ours am skip reason: skip tag Change-Id I4341e177b61df0311f0a3234f8814a0ae2cf9a1b with SHA-1 62718c2bbf is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664305 Change-Id: Ie976da216d8a83306a4a4c5641f39b6e73c71c1e