diff options
| author | 2022-09-07 11:31:11 +0000 | |
|---|---|---|
| committer | 2022-09-07 11:31:11 +0000 | |
| commit | e2a41d3525a7643fbd978b8d9ac5d06cffdc326c (patch) | |
| tree | de5d54958a1fc383c77941f379c44f1c6dd367c6 /libs/androidfw/ResourceTimer.cpp | |
| parent | d78cdda89019aa977d7af2fd18ece99388237d9f (diff) | |
| parent | 310dca830bfdb8ebceb087bb73f55227657ff1b1 (diff) | |
[automerger skipped] Merge "Correctly handle null ProxyInfo in Ikev2VpnProfile" into tm-qpr-dev am: 27c368063d -s ours am: 310dca830b -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: I3b5090fbd1a9b2bedd37634b2b45716978d5c1f6
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