summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author lucaslin <lucaslin@google.com> 2022-08-25 01:07:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-25 01:07:07 +0000
commitb509e1bc563816546a58b80d27ff7de4e92a05f9 (patch)
tree6045e1d85debc499388632f2df31e0e793a80705 /libs/androidfw/ResourceTimer.cpp
parent45b4e35493b4343bb78a9f6697b4ff3bab0a58a1 (diff)
parentf96e5ad5805b68481feaf3305b6ff85cd76d3727 (diff)
[automerger skipped] Copy isBypassable flag from VpnProfile to VpnConfig am: f96e5ad580 -s ours
am skip reason: Merged-In Ib0fa580bb41dcf67e23b00b79de8e0535e5c15a2 with SHA-1 c43db8b4e6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19682391 Change-Id: Iaa3e2a977a887d31fabfb0dcc4f74206df63d2e1 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