diff options
| author | 2022-04-25 22:01:54 +0000 | |
|---|---|---|
| committer | 2022-04-25 22:01:54 +0000 | |
| commit | 78bbbcb8f034a7811d2c1f907dac2de8d745ee3f (patch) | |
| tree | 23b0eedea508471c0467b34f702c9203f74ece07 /libs/androidfw/StringPool.cpp | |
| parent | c9446b3a983517f45377600e563861a877e16fac (diff) | |
| parent | ce1d875212e4db007de195fe4543f8ff81d96de9 (diff) | |
Merge "Stabalize AmbientContext detection by restoring client requests." into tm-dev am: 889d4894d9 am: cb65f1571b am: 7779e0927c am: ce1d875212
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17893731
Change-Id: I0c729265d51cc74f112709f72130f8be988a63a0
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