| commit | 9ee71fd6523382c798de0c3032509e4404f8c7cc | [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 | 1ec09a7e4858d1e5f5a429080a4a82807caef82c [diff] | |
| parent | 569e241d5c9c03d4b72d77b0df36a95dfa356701 [diff] |
Merge "Expose UdpEncapsulationSocket.getResourceId()" am: 8dc248c84a am: 569e241d5c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547642 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie79141820782688b8705cf0edc59cf7a60c74f13