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