Merge changes from topic "am-4bf8d572a7a148b890f27a2db1c84b98" into tm-d1-dev-plus-aosp (1a7716fb) · Commits · e / os / android_frameworks_base

"...0d0cea2424ae97b27447dc64a7dbfae83c036c45b403392f0e8ba.png" did not exist on "9811ad79f473ebe7765aed2587855b75171f248d"

Commit 1a7716fb authored Sep 26, 2022 by Automerger Merge Worker Committed by Android (Google) Code Review Sep 26, 2022

Browse files

Merge changes from topic "am-4bf8d572a7a148b890f27a2db1c84b98" into tm-d1-dev-plus-aosp

* changes:
  Merge changes from topic "presubmit-am-e095dcb8dc634f1bbc080231db8e0ba1" into sc-qpr1-dev am: 40b5a52b am: 54b2bc03 am: ad2ab1b0 am: 295f468f
  [automerger skipped] [automerge] [RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied 2p: 7af50c4d am: c30420a5 -s ours am: 8e944c7e -s ours am: a2c1b0bb -s ours am: 61ef79fa -s ours

parents 95f1e020 c8005199

Hide whitespace changes

Inline Side-by-side

Please register or to comment