diff options
| author | 2022-08-19 19:17:18 +0000 | |
|---|---|---|
| committer | 2022-08-19 19:17:18 +0000 | |
| commit | acd5e2ceabd87552ababf08c3c01e3e97a104a4e (patch) | |
| tree | 8a5fca08e278f408013e7f8e655484b2cd1dd453 /libs/androidfw/ResourceTimer.cpp | |
| parent | 8892d180541e6ef6dd845cb99f462197dc28da6b (diff) | |
| parent | 94a9616e143731e01222028d3a401692c9444437 (diff) | |
Merge "[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into sc-dev am: 7053007275 -s ours am: b5c51a7b85 -s ours am: fe0441614e -s ours am: d547b26df2 -s ours" into tm-d1-dev-plus-aosp am: c83af5b2d9 -s ours am: 94a9616e14 -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 b479180b73 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459103
Change-Id: I80853db85b711f9e1cc3ffcd1f1eec19993fafa0
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