diff options
| author | 2023-08-31 22:26:25 +0000 | |
|---|---|---|
| committer | 2023-08-31 22:26:25 +0000 | |
| commit | bf25c904c4c4c9d185960eb0e8e1ec065898419b (patch) | |
| tree | 16af564964a81c83ef8ee06da6e926629443d097 /libs/androidfw/AssetsProvider.cpp | |
| parent | 340a1dcb59d96e93c473dd5882ca24d12f067d37 (diff) | |
| parent | 730d49c09af124c2fe592774adb62fc890d42cd7 (diff) | |
Merge "[conflict] Merge "Migrate from android::String isEmpty to empty [aapt]" into main am: 2ce9592378 am: e5ee511172" into udc-dev-plus-aosp am: cf48bbe407 am: 730d49c09a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24615459
Change-Id: Ia2820eb58b932706c24dcfacbcc934f247f293ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions