summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Kathy Chen <kxchen@google.com> 2022-04-25 21:30:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-25 21:30:16 +0000
commitce1d875212e4db007de195fe4543f8ff81d96de9 (patch)
treeed60f674e0c4cbaa4bcb8d896cd08936df9d9479 /libs/androidfw/StringPool.cpp
parent3b5c3e00e49f49f9e755c7b80521cff5a52c3e86 (diff)
parent7779e0927c9c4cc80305ade417580b0cfbb88fb1 (diff)
Merge "Stabalize AmbientContext detection by restoring client requests." into tm-dev am: 889d4894d9 am: cb65f1571b am: 7779e0927c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17893731 Change-Id: I8d525dfcc65b7df3def1e9c661338c70772dec5f 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