diff options
| author | 2022-09-28 18:03:42 +0000 | |
|---|---|---|
| committer | 2022-09-28 18:03:42 +0000 | |
| commit | b5cd9ed3fc432b752da72616102c24f57d5e5b65 (patch) | |
| tree | d973ea14c5c856eeb8d14cff11fb33f2a680934d /libs/androidfw/ResourceTimer.cpp | |
| parent | 507ef45027408874382e1fd4bb405a6dd83bca9d (diff) | |
| parent | f27f7ce99b9130d824e181d89a97c040a0a67e2e (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into qt-dev am: 2663e8aa43 am: 4f404a5015 -s ours am: 974a8471ea -s ours am: e32da18b5e -s ours am: 0b21b97d57 -s ours am: f42de9e535 -s ours am: ec6bffc879 -s ours am: 3e1eabd934 -s ours am: f27f7ce99b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952040
Change-Id: I1fd5062f860077a2a9ff0e5236fdad7323c0f72a
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