diff options
| author | 2021-01-27 05:45:07 +0000 | |
|---|---|---|
| committer | 2021-01-27 05:45:07 +0000 | |
| commit | 14dfb0cfe768ececc66e7ed6b1fc7648c2da1834 (patch) | |
| tree | fcb5c045135850338ead9a429a3a4b9a25ee1338 /libs/androidfw/AssetsProvider.cpp | |
| 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
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions