summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Tom Natan <tomnatan@google.com> 2021-10-21 16:37:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-10-21 16:37:54 +0000
commitfeacb75981d79ccb49d092c47cd60fd593c566f9 (patch)
treee445af2eb39bfd3d4d93d1d881a37db4745861c8 /libs/androidfw/StringPool.cpp
parent2b75dcc314b94cfa2ee02b83696ec368703ae08c (diff)
parent8ea64535a80e7b943d87182e1b05eecbde5b33c7 (diff)
Merge "Make ActivityOptions#setLaunchTaskId a system API" into sc-v2-dev am: fdf0378b8d am: 8ea64535a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16093509 Change-Id: I2a76d0ee05bc162bb171831aaf4691482756388d
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions