diff options
| author | 2022-08-10 11:21:46 +0000 | |
|---|---|---|
| committer | 2022-08-10 11:21:46 +0000 | |
| commit | 8a3f135e5f03a9c1a0a89a8956cba3ffc62cd5ab (patch) | |
| tree | 20ec6ca307552a50fd2ed080192d4426e15e5eb6 /libs/androidfw/ResourceTimer.cpp | |
| parent | 1122b137d0c79c173db65b0a1009de2843ee5b23 (diff) | |
| parent | f1b49e2f1231bb6c6f585897438fc6d7d7a359db (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into qt-dev am: b6d3c1a021 am: d6b9cb3584 -s ours am: c9d18836c2 -s ours am: a173229e2f -s ours am: f6d78a9691 -s ours am: 5750dcd2f3 -s ours am: f9c2abf201 -s ours am: f1b49e2f12 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537069
Change-Id: I5d3ccc2e8fd41e9d96f7f6bc65ce79dfdd75b9da
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