summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2022-08-11 13:30:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-11 13:30:55 +0000
commit747c05821bfdb226eccf5345b26c48f94a987a1c (patch)
tree933bb09d5d9439c07f3c30bccecd8a75ed87cacb /libs/androidfw/ResourceTimer.cpp
parent9a12a0fcd47682c46e7c047b4afbfd8a46fda823 (diff)
parentb0d5eeb893bf28ebe0ca41685b1697b1e872aff5 (diff)
Merge "Revert "Invert the order of event sending and VpnRunner.exit()"" am: 1660147b84 am: 880e944b9c am: b0d5eeb893
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2183496 Change-Id: Ia0716f7910b69c2223a4c491d9b3bb6a5f73f8fa 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