| commit | 2a2244cd62f39f31f70173a48ffdd38e09c01ce4 | [log] [tgz] |
|---|---|---|
| author | Jing Ji <jji@google.com> | Mon Apr 08 20:29:17 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 08 20:29:17 2024 +0000 |
| tree | 73add621dd1cc324946ccab2c9b4456b83a7e1fe | |
| parent | 40d0a9ecf143054fa043c0527368f209c89be78b [diff] | |
| parent | 2bbd55c47821cdcafe84e0363364ac1554ae9ab6 [diff] |
[automerger skipped] Merge changes from topic "bug_298263955_proxy_warning" into main am: ad2da357f8 am: 2bbd55c478 -s ours am skip reason: Merged-In I3c959a7dd62ee57415c22a8034d774fe49a8f64f with SHA-1 0b60166cbf is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3023864 Change-Id: I2206aea44067a5a0c7bb95ef6dca93f5689155cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>