diff options
| author | 2020-10-22 05:48:24 +0000 | |
|---|---|---|
| committer | 2020-10-22 05:48:24 +0000 | |
| commit | 0bd605173dccec0743174b99c7bc83614992a0a4 (patch) | |
| tree | 012be4d8ebcab92dea297a1af6e1b3327947a6f0 /libs/androidfw/AttributeResolution.cpp | |
| parent | cf96c50b54a21bcc4b0d292b8c1f922daf10f0f8 (diff) | |
| parent | 666fbf6275de81fca3ac7b1846419d70db18a371 (diff) | |
Merge changes from topics "cp_sip_transport_supported_api", "cp_sip_transport_supported_pipe" am: 9caec78557 am: 371361d995 am: 666fbf6275
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453715
Change-Id: Ief02f6c15576358e18adf4869ad05653a55aa87a
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions