summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Michael Groover <mpgroover@google.com> 2022-04-21 17:15:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-21 17:15:58 +0000
commitd40e09cb53374693fff05607837690f627cff48b (patch)
treee96369c9ee54c094e97d9ef0da4315bf9b071ee3 /libs/androidfw/StringPool.cpp
parent50c00e725291ee2b13d094e78abad8261c4ea29c (diff)
parent0e76cd748b4f290d813ebd30949928756b85c5cb (diff)
Merge "Allow revoked capabilities to be restored in sharedUserId lineage" into tm-dev am: 80af2faccf am: 0e76cd748b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778610 Change-Id: I02e316076df34fa49c037a556c28109bf5483616 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