diff options
| author | 2023-08-31 10:47:20 +0000 | |
|---|---|---|
| committer | 2023-08-31 18:29:49 +0000 | |
| commit | cbb5520bc8556c9f4e477513cb157f717254ceb2 (patch) | |
| tree | 1a6bf50be795a191e9477a2545d607ff954d3b08 /libs/androidfw/AssetsProvider.cpp | |
| parent | cce004cc51e6df6724c0e34aab192e0b1fa86864 (diff) | |
| parent | e5ee511172be798f860ea7a61858037f75903d36 (diff) | |
[conflict] Merge "Migrate from android::String isEmpty to empty [aapt]" into main am: 2ce9592378 am: e5ee511172
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725659
Change-Id: I177a7b051ecd418cc07b3026ae4100cac271408e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I1900f2285ee3c3b1eb57d2cef3990896a64dae01
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions