commit | 05287750f5b4a397d9657548a915c5f2d579a9c1 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:19 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:19 2020 +0000 |
tree | be42bf54a539c0f92c96f7b05cc65bc3d9e10360 | |
parent | b8b0a2bcd6c0a78ae956807cf2099dd2b7e341d1 [diff] | |
parent | 2d4d8df44a439bf7eb760f115093da1124047ffa [diff] |
[automerger skipped] Merge "Merge Android R" am: 81cfc612a8 -s ours am: 0311635e85 -s ours am: 2d4d8df44a -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: I3c8afafaa3df4fab31d9c8658aa99d518beec797