summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Thomas Stuart <tjstuart@google.com> 2022-08-10 21:25:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 21:25:13 +0000
commit8ea4a4a2c29ccb8837d9d741fb9425930bb7d73b (patch)
treebce707b6c09964e94b97d1a7b1308e9083e19d0f /libs/androidfw/ResourceTimer.cpp
parente04ee4c6a52133ec533788ee1e4bcf5a64c49915 (diff)
parent32473449398500d4146c7e8876bcf9ea06bad0f0 (diff)
[automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev am: 2f287743a4 am: b680cef434 -s ours am: 3247344939 -s ours
am skip reason: Merged-In I025245b2a6f8cfaca86f268851a9d8f0817e07dd with SHA-1 d54a48f42a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19322229 Change-Id: I3a62629a028b181b6ae99f5897e4533e8298df8d 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