| commit | 2d4d8df44a439bf7eb760f115093da1124047ffa | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:28 2020 +0000 |
| tree | be42bf54a539c0f92c96f7b05cc65bc3d9e10360 | |
| parent | 0263d324d01b272c632ede31b1295edeb928eb79 [diff] | |
| parent | 0311635e85a678edf2042be99ca461826855dc34 [diff] |
[automerger skipped] Merge "Merge Android R" am: 81cfc612a8 -s ours am: 0311635e85 -s ours am skip reason: Change-Id I4c367c09b9cbf00d8e1100130ad3d80c0cb2562f with SHA-1 3045de1292 is in history Original change: https://android-review.googlesource.com/c/platform/external/chromium-libpac/+/1422304 Change-Id: I09c18e9a8ff34257d28b2a9006370c1266b83fd9