summaryrefslogtreecommitdiff
path: root/libs/androidfw/LocaleDataTables.cpp
diff options
context:
space:
mode:
author Jeff Chang <chengjeff@google.com> 2022-09-26 02:47:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-26 02:47:48 +0000
commit3b5e0cc7ab66d8f5ae7c6abc9df5b9bedc52fd8d (patch)
tree3c220fd3faeae6ef678cc5f78b6e226ff4762c89 /libs/androidfw/LocaleDataTables.cpp
parent31937d2f457d437bdb5d558f3044f083496170e3 (diff)
parenta2c1b0bb8fb4083a02ec6aa49a2ac67e1be93bd4 (diff)
[automerger skipped] [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d5f am: c30420a5cf -s ours am: 8e944c7e5d -s ours am: a2c1b0bb8f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949706 Change-Id: I3fe63add94c816afc7f44afa4e52b97281497d44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/LocaleDataTables.cpp')
0 files changed, 0 insertions, 0 deletions