summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author chiachangwang <chiachangwang@google.com> 2022-09-07 11:30:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-07 11:30:33 +0000
commitd78cdda89019aa977d7af2fd18ece99388237d9f (patch)
treede5d54958a1fc383c77941f379c44f1c6dd367c6 /libs/androidfw/ResourceTimer.cpp
parent4d0f54c7462d76e3a82937bf74d0c990c1016ba6 (diff)
parent1dc9d5c53bf76399bbe575e1295715152af25df7 (diff)
[automerger skipped] Correctly handle null ProxyInfo in Ikev2VpnProfile am: 9a80121f6b -s ours am: 1dc9d5c53b -s ours
am skip reason: Merged-In I67ee2aa5c96dc22ba8fcd2be3fd4c090dec20697 with SHA-1 29348dbfca is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19859722 Change-Id: If294eb98504566212da208bbf31c920af159f395 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