summaryrefslogtreecommitdiff
path: root/tools/aapt2/StringPool.cpp
diff options
context:
space:
mode:
author Mariia Sandrikova <mariiasand@google.com> 2022-04-25 15:53:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-25 15:53:14 +0000
commit378d4f20e5260de850916aa0eff4df5f981604e2 (patch)
tree2761891e2be8ec9b7d0a8f062fe09910e87d4ae2 /tools/aapt2/StringPool.cpp
parent6bcc0491faeaa98cf78d5d3bc15876e2006eabb9 (diff)
parent1238011150abf7f2ce52b28408abdd65bac0e81e (diff)
Merge "Exception for Kids Mode from ignoreOrientationRequest." into tm-dev am: 42f304140f am: 6cedb4485a am: 14758aaec6 am: 1238011150
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17760471 Change-Id: I2a43a8a133dfa15677319f483c7cacda1ea2db26 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions