| commit | 164d4744d43738f52abfde217a36d4491d82636e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 31 23:20:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 31 23:20:49 2023 +0000 |
| tree | 55099120b8e26b8235539bc8ce25e9ab204c645b | |
| parent | 86d4ec83458a1860bf6d8a99ed97a6b1544fcec2 [diff] | |
| parent | bf25c904c4c4c9d185960eb0e8e1ec065898419b [diff] |
[automerger skipped] 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 am: bf25c904c4 -s ours am skip reason: Merged-In I1900f2285ee3c3b1eb57d2cef3990896a64dae01 with SHA-1 8f74b2a12b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24615459 Change-Id: I0c7479f4f56dfa2412dc67e3659fd69ada453cd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>