summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Nate(Qiang) Jiang <qiangjiang@google.com> 2023-04-18 20:35:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-18 20:35:33 +0000
commit3c027f0a612292ad0f5dcd765cfaf2a79044f280 (patch)
tree462d5b22cf1984cac73e96f96da3287e655170bc /libs/androidfw/StringPool.cpp
parent507b0f2dd9e08582ed3d1da937bc620cdb99fcd0 (diff)
parent93ef7c0d259dea910b37b4084afbe613eb72b738 (diff)
[automerger skipped] Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-qpr-dev am: 4de0740bf8 -s ours am: d294e11427 -s ours am: 346ad5fada -s ours am: a274175a7b -s ours am: 93ef7c0d25 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599988 Change-Id: I9e98dce7ba5d6035fd53755a96d92182938b7a9f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions