commit | 14dfb0cfe768ececc66e7ed6b1fc7648c2da1834 | [log] [tgz] |
---|---|---|
author | Chiachang Wang <chiachangwang@google.com> | Wed Jan 27 05:45:07 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 27 05:45:07 2021 +0000 |
tree | fcb5c045135850338ead9a429a3a4b9a25ee1338 | |
parent | 54e430d69aad974821b9d9d400f6e31cf227a6f3 [diff] | |
parent | 18896c83ed5ac056a5f2266b1592c74d91172d81 [diff] |
Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 18896c83ed Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie79141820782688b8705cf0edc59cf7a60c74f13