)]}'
{
  "commit": "49b30517839032a70bb8120168d8dbe0a424ae18",
  "tree": "6aaebb8c133346b368127a4867a37a7f85b7a5ab",
  "parents": [
    "cec18f583a18621322fe768ca984373d951b558c"
  ],
  "author": {
    "name": "Josh Tsuji",
    "email": "tsuji@google.com",
    "time": "Mon May 02 11:07:42 2022 -0400"
  },
  "committer": {
    "name": "Josh Tsuji",
    "email": "tsuji@google.com",
    "time": "Mon May 02 11:07:45 2022 -0400"
  },
  "message": "[conflict] Merge \"Use Launcher smartspace instead of SysUI\u0027s for the shared element transition.\" into tm-dev am: 7b5e80f2f6 am: 4c4fac6cad\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17892808\n\nChange-Id: I366fed58aafc477399a792e5b65fca4df915a4d8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "b2295b94127bc2d72626f498c0c2fe62fbb762ed",
      "old_mode": 33188,
      "old_path": "packages/SystemUI/shared/src/com/android/systemui/shared/system/smartspace/ILauncherUnlockAnimationController.aidl",
      "new_id": "5a30901f1a8bbb1dd7a1f2f82cc71c4f5c018df3",
      "new_mode": 33188,
      "new_path": "packages/SystemUI/shared/src/com/android/systemui/shared/system/smartspace/ILauncherUnlockAnimationController.aidl"
    },
    {
      "type": "modify",
      "old_id": "04c9a45af065c3fcf0de8f6f004f3cfc075c73b5",
      "old_mode": 33188,
      "old_path": "packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java",
      "new_id": "ea14b64b8b1824cf1c2eeff4ab26efefd72f00f0",
      "new_mode": 33188,
      "new_path": "packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java"
    },
    {
      "type": "modify",
      "old_id": "853d7402a1f88dff007409fabb184cef2b897f5a",
      "old_mode": 33188,
      "old_path": "packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java",
      "new_id": "cb3172dabdb1a31225198977d1e82e9dddedac18",
      "new_mode": 33188,
      "new_path": "packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java"
    },
    {
      "type": "modify",
      "old_id": "14c9cb2022bcc039d8daf604d6342dd86be69955",
      "old_mode": 33188,
      "old_path": "packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java",
      "new_id": "083f2fe53d179a5ff72bdc3717c5c22c3588d399",
      "new_mode": 33188,
      "new_path": "packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java"
    },
    {
      "type": "modify",
      "old_id": "c90fa4db1588b7fc4c55b8324e8c7ab446234bd7",
      "old_mode": 33188,
      "old_path": "packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt",
      "new_id": "b21a886b037d8c8081cc6c493dfabcd95c8303e5",
      "new_mode": 33188,
      "new_path": "packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt"
    },
    {
      "type": "modify",
      "old_id": "b7c224a713987855e188397d86ea4bfee86985e5",
      "old_mode": 33188,
      "old_path": "packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java",
      "new_id": "10ea1e06c6d7faa8c2d0b2c0f6dda7382e7a075d",
      "new_mode": 33188,
      "new_path": "packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java"
    },
    {
      "type": "modify",
      "old_id": "8f3e696476a5981dffcf1409c8fb5196a73b291c",
      "old_mode": 33188,
      "old_path": "packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java",
      "new_id": "1cab5abc36ee1b1d6b3290ac611d41e916e49055",
      "new_mode": 33188,
      "new_path": "packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java"
    },
    {
      "type": "modify",
      "old_id": "e4f42b10dab055b690feb203af821c256e7a0484",
      "old_mode": 33188,
      "old_path": "packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java",
      "new_id": "807122b62e9f499f905f95f4cf5a178664c92e75",
      "new_mode": 33188,
      "new_path": "packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java"
    },
    {
      "type": "modify",
      "old_id": "1753157c631db5ccc2a6b3030688bfb078df9a15",
      "old_mode": 33188,
      "old_path": "packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java",
      "new_id": "650a5d0a871291e4060e9e8a2d84aacbc4c585ff",
      "new_mode": 33188,
      "new_path": "packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java"
    }
  ]
}