summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ryan Prichard <rprichard@google.com> 2022-09-02 21:36:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-02 21:36:13 +0000
commit7dd0f616ab82493af9480e93aafda0f9a4064169 (patch)
treea950d57e829233db6ed68f06c21edc2d49c07175 /libs/androidfw/ResourceTimer.cpp
parent693835d690b68dc4285508770f6a1e26ab0ee441 (diff)
parent405237f24d89b0d779bbfd0b10797a26a8a59775 (diff)
Merge "incfs: tolerate either ptrdiff_t or size_t for std::span" am: f93b1f9698 am: 405237f24d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2202603 Change-Id: I69d99c2abfc9f0e9145cafa23180a34418c1f326 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions