diff options
| author | 2022-11-22 03:22:39 +0000 | |
|---|---|---|
| committer | 2022-11-22 03:22:39 +0000 | |
| commit | 59d1c8f546d3c87532442c5a72011e383efbcc9b (patch) | |
| tree | eaee547109a8dbd775d77ff17e6c46404e02bbfa /libs/androidfw/AssetsProvider.cpp | |
| parent | 9a47d7fad933878fb8a29b320f53d372c2864eff (diff) | |
| parent | dec8f84817e2d8fbb40c2ef56ddf9429f7cf1859 (diff) | |
[automerger skipped] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied am: 337a2353ae -s ours am: 8bcd87e202 -s ours am: dec8f84817 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20513541
Change-Id: I436bfb8ccbeaef27886b0956dc696d99205ded18
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