summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2024-08-27 00:55:01 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-27 00:55:01 +0000
commit843b1a512595e5a7da4f6c42f8f374679671a2d9 (patch)
tree4b6b0351f8632fd488936c70778ead7b83794d58 /libs/androidfw/ResourceTimer.cpp
parent9caedd0657b32cbee8c54f537923180c479921fb (diff)
parentffb5d4c21c6df0c019c7758aeca13aa29d85a9ec (diff)
[automerger skipped] Merge "Revert "Set all sensors to enable test hal when one of them crea..."" into aosp-main-future am: ffb5d4c21c -s ours
am skip reason: Merged-In I573639f1b87a96ef4dcccc29afa5b5fe551d0dac with SHA-1 85afc0ab6d is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28904754 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28988692 Change-Id: I645450d39179c39d426feea52da6da585a9766dd 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