commit | 9fc11ed4804084d39359dcaf89c0675db267dd8f | [log] [tgz] |
---|---|---|
author | Xiao Ma <xiaom@google.com> | Thu Oct 29 06:50:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 29 06:50:05 2020 +0000 |
tree | 8c986587e72de849aad48785c14e5c5a9cd8f82b | |
parent | ce5f7debea18b2ddc776e08a26d025649e76ca9a [diff] | |
parent | c9d181a3e3cf84ebe7b65363cc9cc017cf05800b [diff] |
Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ" am: 7f5a15173a am: aa24ca0106 am: c9d181a3e3 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460265 Change-Id: I38ca7a3d1a07d511d99beb9fbe3eb48b265d40e9