diff options
| author | 2022-07-26 17:38:25 +0000 | |
|---|---|---|
| committer | 2022-07-26 17:38:25 +0000 | |
| commit | d723156cbc6a82ae190f88e251dc14d153692539 (patch) | |
| tree | 4d5690a9131013d089ac2eea0e89cda61a8bb709 /libs/androidfw/AssetsProvider.cpp | |
| parent | e01666d3715b8ac77e89291356707214cc27e1e7 (diff) | |
| parent | 42a50bd598447765cdfeab5b425152ae2b577965 (diff) | |
[automerger skipped] Merge "Revert^2 "Move out allowlists for com.android.cellbroadcast"" am: 86b958b661 -s ours am: 13b5cdb38a -s ours am: 42a50bd598 -s ours
am skip reason: Merged-In I7155dbad359af7480bce1c6b321b17032acaab5e with SHA-1 1ce3acc30f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2147020
Change-Id: I2e8c15ffcec4ac86dc62c8b422b62c7ebf230d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions