commit | 569e241d5c9c03d4b72d77b0df36a95dfa356701 | [log] [tgz] |
---|---|---|
author | Chiachang Wang <chiachangwang@google.com> | Wed Jan 27 05:22:15 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 27 05:22:15 2021 +0000 |
tree | a9e1c48a554a2d8f9a8aacdca00478156209ff55 | |
parent | db887739f9b5108e75dd917edbe78da2e6adc337 [diff] | |
parent | a034331a5670b69b9e8c0f9fc02bf80c351f89fb [diff] |
Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iabe3fe4ab7fcad9e8c3f7ad89a49d3d5b1a874ce