diff options
| author | 2022-07-29 13:22:52 +0000 | |
|---|---|---|
| committer | 2022-07-29 13:22:52 +0000 | |
| commit | 09a3c1fa9087c967f6e8e30a0b0e79b46b509499 (patch) | |
| tree | 4dfd2fb7b15693dee8c58bd26de994af8f6e96e1 /tools/aapt2/StringPool.cpp | |
| parent | 44ec08c9ea096d61cf6b38ca2608af59701bd91d (diff) | |
| parent | 334a4be176df477f5b67b04cacff09aa3e533d55 (diff) | |
Merge "Correct SHOW_WALLPAPER conflicts the definition of isTranslucent" into tm-qpr-dev am: 334a4be176
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19033154
Change-Id: I9abf281388035425cbb5181a60c5660844e654f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions