summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2023-09-08 22:10:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-08 22:10:36 +0000
commit236c50ccd4defeb3c5ba9b7afc5f3ce041e389f3 (patch)
tree0cee364f5b90fe50fdc34164bdaaa53ff53b350e /libs/androidfw/AssetManager.cpp
parent7cef077d60c356b1100c84f4331e41d95725c883 (diff)
parent4420a988e2a96cc0b944a6f93694d46d0ef23632 (diff)
Merge "Use localtime_r() on Windows too." into main am: 4420a988e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2741082 Change-Id: I9576e7dccc11b7c585c036b5147c7f92655465d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions