summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Benedict Wong <benedictwong@google.com> 2022-08-25 01:07:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-25 01:07:13 +0000
commit9467b42f1798abbd0a63e88f2cd8c1e4509428c5 (patch)
tree6045e1d85debc499388632f2df31e0e793a80705 /libs/androidfw/ResourceTimer.cpp
parentb509e1bc563816546a58b80d27ff7de4e92a05f9 (diff)
parent58b9ab773e6f2e347c67afbb89951d15be31b13e (diff)
[automerger skipped] Merge "Copy isBypassable flag from VpnProfile to VpnConfig" into tm-qpr-dev am: 58b9ab773e -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: I31f727ee361ee0cd768f2a06e29e205011c7b053 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