summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Shivam Agrawal <shivamagrawal@google.com> 2022-04-05 19:47:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-05 19:47:04 +0000
commite3250aa2ad7d9948965878a74651d068caf1f4c3 (patch)
tree8011da3ac6a312e583aae6632492420d5c6c2fd8 /libs/androidfw/AssetsProvider.cpp
parentbd431cc65730ca3b072640569336e6987feb9b02 (diff)
parent87550b067afb16ca0e3e3c16450e14bc050915a9 (diff)
Merge changes from topic "embedding-race-condition" into tm-dev am: 87550b067a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17494165 Change-Id: Ic83d788e42d282ffbadd9de8f501ba29b4e5da54 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions