| commit | b1da35c0076def50bcd04b3232a572f74a1cb276 | [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 | a9e1c48a554a2d8f9a8aacdca00478156209ff55 | |
| parent | 54c95b4c68b5852b6bc7830390957601607c16d8 [diff] | |
| parent | 9497d45e6b4f14c6b45ee174c1399a7ae5592751 [diff] |
Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 9497d45e6b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie79141820782688b8705cf0edc59cf7a60c74f13