summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Kathy Chen <kxchen@google.com> 2022-04-25 21:08:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-25 21:08:19 +0000
commit6c62bc1d96646928ff5ae07a04d5209ef3c8b3d6 (patch)
tree9b0a461bfeeeed4a73269b01586e6f415da4e246 /libs/androidfw/StringPool.cpp
parentf6419dd360900623394e0fe6acf550094c5802bd (diff)
parent4061c6090887d0ce16aa6cca1945ef3d1ca21b63 (diff)
Merge "Stabalize AmbientContext detection by restoring client requests." into tm-dev am: 889d4894d9 am: 4061c60908
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17893731 Change-Id: I000f2e7a9812934550d88c7d773225e59641593b Ignore-AOSP-First: this is an automerge 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