diff options
| author | 2022-05-12 14:37:11 +0000 | |
|---|---|---|
| committer | 2022-05-12 16:09:09 +0000 | |
| commit | 547648c23c61262c84f8cd6781221e43ef3db601 (patch) | |
| tree | 99662e0f22a3ff38893e8b5910d8414603a3281f /libs/androidfw/ResourceTimer.cpp | |
| parent | d116cd379fbd49f7a31231c63ea371a9375c88a8 (diff) | |
| parent | 0d2e7006cef2e8aa571af99265a3224a211629a5 (diff) | |
[conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18297726
Bug: 232399715
Change-Id: I04b29b3875451e822ce1f37fcace9be31669f625
Merged-In: I9784527d6d79235830f562c1944562f5a6ac1fb3
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