)]}'
{
  "log": [
    {
      "commit": "10f628cda2c20056b14de9569871527dffaf83ed",
      "tree": "f33db0ad21583a009323ff8333f36077efca64f4",
      "parents": [
        "c3a67fca974d9b7a2171881d7ad8494267c41afd",
        "0e861d3e25e4926fb8cff94f7fed558b5116f903"
      ],
      "author": {
        "name": "Fyodor Kupolov",
        "email": "fkupolov@google.com",
        "time": "Thu May 11 09:35:14 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 11 09:35:14 2017 +0000"
      },
      "message": "Merge \"Added isUserNameSet\" into oc-dev am: a9154ab391\nam: 0e861d3e25\n\nChange-Id: I335995890354ce7e4e591782af1188c093e89a6d\n"
    },
    {
      "commit": "70dfa834ee44d92ad3815248a053dc80447b1886",
      "tree": "791778afb2c7b6ad07925850009f3698a73b10b8",
      "parents": [
        "4d252e4058ea1b3992add5900c5df623de672458",
        "0d9425e3e47e45b3ab21f42237b2cf55395b506f"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Thu May 11 06:09:05 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 11 06:09:05 2017 +0000"
      },
      "message": "Merge \"Reconnect to DAService after binding is dead\" into oc-dev am: ef5700667f\nam: 0d9425e3e4\n\nChange-Id: I597a3a5382ebf9798b322fc8bb3c88749d117170\n"
    },
    {
      "commit": "b6511a60e0766b1f11ad0c28c1f6711c4edb66b6",
      "tree": "268cb0d70596cb8af26065b2081b19c61a63f65b",
      "parents": [
        "d7a168e11a896ef5915d7c0e7aa3eb8c1b5a1b7d",
        "3b178f77ce4cc611873089375821ba9ac640894d"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Thu May 11 05:30:01 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 11 05:30:01 2017 +0000"
      },
      "message": "Merge \"Offload saving bitmaps from binder threads\" into oc-dev am: 31ef139466\nam: 3b178f77ce\n\nChange-Id: I12603ba93310abaa8612c118ebf77ac25e6918c5\n"
    },
    {
      "commit": "0e861d3e25e4926fb8cff94f7fed558b5116f903",
      "tree": "5d90e6d0d2ac60b02bf99ab35f5d21d36b158ce8",
      "parents": [
        "052bf032cbb61a5506cfc84a3bd628371ddbd08c",
        "a9154ab39112f30b9f90e62b79c6ed8f43dfc5bb"
      ],
      "author": {
        "name": "Fyodor Kupolov",
        "email": "fkupolov@google.com",
        "time": "Thu May 11 05:22:19 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 11 05:22:19 2017 +0000"
      },
      "message": "Merge \"Added isUserNameSet\" into oc-dev\nam: a9154ab391\n\nChange-Id: I013381eab8809b98d17e7cf9063a62e4884b0e2a\n"
    },
    {
      "commit": "a9154ab39112f30b9f90e62b79c6ed8f43dfc5bb",
      "tree": "d1a6ac51ade5bd577d924a3d31953d892453a1ad",
      "parents": [
        "ea60efa8ef42160a7e886fc93ba1fee6a0f9587d",
        "605b12a6d0110c81d63e78e93f299a6b5753da46"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu May 11 03:19:49 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu May 11 03:19:52 2017 +0000"
      },
      "message": "Merge \"Added isUserNameSet\" into oc-dev"
    },
    {
      "commit": "527b92c8d864d3c3276d04fc04628ed644ca8ecf",
      "tree": "6a38a3a3f85474c07e5aa4ad9c5d085cfd684934",
      "parents": [
        "e048a214a9f34e0bbbf9827cfff003cb33474913",
        "ee8931e258c07410b2affd6d5e8b9239b170c504"
      ],
      "author": {
        "name": "Santos Cordon",
        "email": "santoscordon@google.com",
        "time": "Thu May 11 01:48:18 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu May 11 01:48:26 2017 +0000"
      },
      "message": "Merge \"Add uniqueId to Virtual Display and pass through to inputflinger (1/2)\""
    },
    {
      "commit": "0d9425e3e47e45b3ab21f42237b2cf55395b506f",
      "tree": "81f2334f2b27d26127ea6266dee1a04402cf1fe5",
      "parents": [
        "2ef9a3911edcbbfa17433e8a7390412e364ceb55",
        "ef5700667fc19a5a903d14e3d90b2d4aed2f2e5c"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Thu May 11 00:15:47 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 11 00:15:47 2017 +0000"
      },
      "message": "Merge \"Reconnect to DAService after binding is dead\" into oc-dev\nam: ef5700667f\n\nChange-Id: I03049914406ed38f92c3a6a43a82f55504c6e518\n"
    },
    {
      "commit": "3b178f77ce4cc611873089375821ba9ac640894d",
      "tree": "503ea9c91c28741f8f0b330e7d303433305df6c3",
      "parents": [
        "07db193ebc020978d2ccf43d6c88945d4992fea1",
        "31ef1394663ff7f36be36e63898544afc6a10c66"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Thu May 11 00:06:56 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 11 00:06:56 2017 +0000"
      },
      "message": "Merge \"Offload saving bitmaps from binder threads\" into oc-dev\nam: 31ef139466\n\nChange-Id: I2980b05a8a997e003792fe995973b54eaf29d5e1\n"
    },
    {
      "commit": "ef5700667fc19a5a903d14e3d90b2d4aed2f2e5c",
      "tree": "4879a319df05e38d848f0b63229d7c21a1490d1b",
      "parents": [
        "31ef1394663ff7f36be36e63898544afc6a10c66",
        "09c529a9bc85bfd0d50b65f447472ad064eac16c"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Wed May 10 23:20:35 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 10 23:20:39 2017 +0000"
      },
      "message": "Merge \"Reconnect to DAService after binding is dead\" into oc-dev"
    },
    {
      "commit": "605b12a6d0110c81d63e78e93f299a6b5753da46",
      "tree": "173b16f2609d7c814c46d763eef6b9590afbedb8",
      "parents": [
        "62643dddc7824d33862155d05b19c57cb01b0ef2"
      ],
      "author": {
        "name": "Fyodor Kupolov",
        "email": "fkupolov@google.com",
        "time": "Wed May 10 15:58:09 2017 -0700"
      },
      "committer": {
        "name": "Fyodor Kupolov",
        "email": "fkupolov@google.com",
        "time": "Wed May 10 15:58:09 2017 -0700"
      },
      "message": "Added isUserNameSet\n\nIt can be used to check that the value returned by getUserName() was set\nby the user and is not a default value returned by the system.\n\nTest: UserManagerServiceUserInfoTest pass\nBug: 38138381\nChange-Id: I0ca37970fda548508190bffd1fa7be95d4a15076\n"
    },
    {
      "commit": "31ef1394663ff7f36be36e63898544afc6a10c66",
      "tree": "018938a6e32058f034aaa82ad3f7b44a7217e010",
      "parents": [
        "ca50e88b6b0a3ba2d66f1316cc7403dca2748ab1",
        "475c36539da9687d75447adb9054c98ce03c754a"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed May 10 22:24:09 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 10 22:24:14 2017 +0000"
      },
      "message": "Merge \"Offload saving bitmaps from binder threads\" into oc-dev"
    },
    {
      "commit": "baed8c132111248808f65fea6f8fe32f3f367362",
      "tree": "fb7ed73ecde54fdbd189c268fe5bd84ed38d1d04",
      "parents": [
        "356cccd67c59f893dc1a7b47e5ad93981026e473",
        "023b6b9d236d1848f896b19e3509c4b0e2d07d0d"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed May 10 21:18:46 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 10 21:18:51 2017 +0000"
      },
      "message": "Merge \"Add uniqueId to Virtual Display and pass through to inputflinger (1/2)\" into oc-dev-plus-aosp"
    },
    {
      "commit": "023b6b9d236d1848f896b19e3509c4b0e2d07d0d",
      "tree": "4c0fbd5d027647337bfb3badc6ad704369a927e8",
      "parents": [
        "9e79409e6f8d72137e2b1da2068f9ec177bbd6e2"
      ],
      "author": {
        "name": "Santos Cordon",
        "email": "santoscordon@google.com",
        "time": "Wed Apr 05 10:31:15 2017 -0700"
      },
      "committer": {
        "name": "Santos Cordon",
        "email": "santoscordon@google.com",
        "time": "Wed May 10 13:03:32 2017 -0700"
      },
      "message": "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)\n\nThis CL adds :\n1) Adds uniqueId (protected via system/sig permission) to virtual\ndisplays.\n2) Add support for N virtual display viewports into inputflinger.\n3) Set the virtual display\u0027s viewports in inputflinger if it has the\nuniqueId value set to non-null. (a) Moving the new viewport from java to\nnative inputflinger and (b) adding \"uniqueId\" value to viewports makes\nup the great majority of this change.\n4) From the inputflinger side, we also read in a new value from the\ninput device configuration files called \u0027touch.displayId\u0027.\n5) When touch.displayId and the virtual display\u0027s uniqueId match,\ninputflinger links the two.\n\nTest: Start VR and ensure that the virtual viewport shows up when running\n\u0027adb shell dump input\".  Run a VR app, and ensure that the virtual input\ndevice is associated with the new virtual viewport.\nTest: com.android.server.display.DisplayManagerServiceTest\n\nBug: 36051620\nChange-Id: Id728d6e7292feaa1d8de7660bc6a2ec90fa1ff3c\n"
    },
    {
      "commit": "09c529a9bc85bfd0d50b65f447472ad064eac16c",
      "tree": "e80a4720b48132a5cacddc6950d26821eebf2e55",
      "parents": [
        "456882b5ae58e3e62a725663ccb2328d8b074526"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Mon May 01 10:05:28 2017 -0700"
      },
      "committer": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Wed May 10 11:57:19 2017 -0700"
      },
      "message": "Reconnect to DAService after binding is dead\n\n- When the DO/PO process crashes twice with a short interval, AM gives up\nand the binding will be \"died\".  Once binding is in this state it\u0027ll never\nbe re-connected.\n\n(Still, DO/PO can disable and re-enable their DAS to force DPMS to bind again\nthough.)\n\n- Detect this and re-connect after one hour.\n\n- Back-off time will be exponentially increased and never reset until DPMS\nexplicitly re-connects, which happens when:\n-- the device rebooted,\n-- the user stopped and re-started, or\n-- the DAS is disabled and re-enabled.\n\nTest: adb shell am instrument -e class com.android.server.am.PersistentConnectionTest -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyConstantsTest -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests\nTest: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l VERBOSE -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceDeviceOwnerTest\nTest: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l VERBOSE -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceProfileOwnerTest\n\nBug 37711907\n\nChange-Id: Ie0b227a94e6ce85d72a969a4dea1020baf734e2f\n"
    },
    {
      "commit": "c8097441e2a933183669a86707a25581b42b83a4",
      "tree": "421ec71ffc685184c346e21875d94546769e0174",
      "parents": [
        "df13737efbfd82fce2ec1f95f8e03ec13b14dee1",
        "537ece988ae0e854f716266fe3dc117f2888bf08"
      ],
      "author": {
        "name": "Bryce Lee",
        "email": "brycelee@google.com",
        "time": "Wed May 10 16:04:32 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 10 16:04:32 2017 +0000"
      },
      "message": "Merge \"Prevent non-fullscreen activities from influencing orientation\" into oc-dev am: 8a698a1721\nam: 537ece988a\n\nChange-Id: Idb7c86cae2974d31a04aefec34a6ee7baeafb7ec\n"
    },
    {
      "commit": "537ece988ae0e854f716266fe3dc117f2888bf08",
      "tree": "68f665c675aa0816a7cf612f83f179ccf47a8191",
      "parents": [
        "12018312621b37f5e171cb2d5ff5c1bf527f34e0",
        "8a698a17215919e6ce575ec80d091381f0482d27"
      ],
      "author": {
        "name": "Bryce Lee",
        "email": "brycelee@google.com",
        "time": "Wed May 10 15:04:05 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 10 15:04:05 2017 +0000"
      },
      "message": "Merge \"Prevent non-fullscreen activities from influencing orientation\" into oc-dev\nam: 8a698a1721\n\nChange-Id: I7dd30182184fc5ce6ec5e9750eaa26f174b79b38\n"
    },
    {
      "commit": "8a698a17215919e6ce575ec80d091381f0482d27",
      "tree": "26c285f66203540cb73d6cceafe0740dfd5dc235",
      "parents": [
        "b94abe5e30f9be317cee31331e15fa1fab7898fc",
        "39791594560b2326625b663ed6796882900c220f"
      ],
      "author": {
        "name": "Bryce Lee",
        "email": "brycelee@google.com",
        "time": "Wed May 10 14:45:34 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 10 14:45:39 2017 +0000"
      },
      "message": "Merge \"Prevent non-fullscreen activities from influencing orientation\" into oc-dev"
    },
    {
      "commit": "7e87b672f07605420c69e7d8210830f4ec4d4123",
      "tree": "8feb59b51307ec21b4fee02082053460af351c83",
      "parents": [
        "4d147ff91832f3134ae713e5e545035c92cf1d2a",
        "a08220b8175bc008edc5a163007db1d04431a6be"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed May 10 10:46:54 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 10 10:47:00 2017 +0000"
      },
      "message": "Merge \"Add tests for chooseRestorePolicy.\""
    },
    {
      "commit": "ee8931e258c07410b2affd6d5e8b9239b170c504",
      "tree": "3d83c229e54c7f955d55deae638a7c02bb307aad",
      "parents": [
        "4b02b5ac4538ad74190640b53ef0d9500356487f"
      ],
      "author": {
        "name": "Santos Cordon",
        "email": "santoscordon@google.com",
        "time": "Wed Apr 05 10:31:15 2017 -0700"
      },
      "committer": {
        "name": "Santos Cordon",
        "email": "santoscordon@google.com",
        "time": "Tue May 09 18:17:39 2017 -0700"
      },
      "message": "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)\n\nThis CL adds:\n1) Adds uniqueId (protected via system/sig permission) to virtual\ndisplays.\n2) Add support for N virtual display viewports into inputflinger.\n3) Set the virtual display\u0027s viewports in inputflinger if it has the\nuniqueId value set to non-null. (a) Moving the new viewport from java to\nnative inputflinger and (b) adding \"uniqueId\" value to viewports makes\nup the great majority of this change.\n4) From the inputflinger side, we also read in a new value from the\ninput device configuration files called \u0027touch.displayId\u0027.\n5) When touch.displayId and the virtual display\u0027s uniqueId match,\ninputflinger links the two.\n\nTest: Start VR and ensure that the virtual viewport shows up when running\n\u0027adb shell dump input\".  Run a VR app, and ensure that the virtual input\ndevice is associated with the new virtual viewport.\nTest: com.android.server.display.DisplayManagerServiceTest\n\nBug: 36051620\nChange-Id: Ic2117eb8e19f7f3c59687160591f8bc6692c1f12\n"
    },
    {
      "commit": "475c36539da9687d75447adb9054c98ce03c754a",
      "tree": "d8eb5d189801b945aa4559ffa9b4910d16191c01",
      "parents": [
        "9414a25592de67508143a1fd7a98136d90371894"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Mon May 08 14:29:03 2017 -0700"
      },
      "committer": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Tue May 09 16:53:01 2017 -0700"
      },
      "message": "Offload saving bitmaps from binder threads\n\nBug 34691191\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests\nTest: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases\nTest: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutHostTestCases\nTest: Manual test with the phone app\n\nChange-Id: Ibccf8ca162eae9179ee4cbdf0307ff34a6953aa1\n"
    },
    {
      "commit": "39791594560b2326625b663ed6796882900c220f",
      "tree": "db4e06445bea784502fc915834fa7b15c92632c3",
      "parents": [
        "dea0438385393d9dab1579823b79e413c6e22f3b"
      ],
      "author": {
        "name": "Bryce Lee",
        "email": "brycelee@google.com",
        "time": "Wed Apr 26 09:29:12 2017 -0700"
      },
      "committer": {
        "name": "Bryce Lee",
        "email": "brycelee@google.com",
        "time": "Tue May 09 16:13:51 2017 -0700"
      },
      "message": "Prevent non-fullscreen activities from influencing orientation\n\nThis changelist enforces that activities targeting O and beyond\ncan only specify an orientation if they are fullscreen. The\nchange ignores the orientation on the server side and throws an\nexception when the client has an orientation set in onCreate or\ninvokes Activity#setRequestedOrientation.\n\nFixes: 33483680\nTest: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAppConfigurationTests#testNonFullscreenActivityProhibited\nTest: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAppConfigurationTests#testLegacyNonFullscreenActivityPermitted\nChange-Id: I4f7f79744918fad6465a537633dfadec8d05c6df\n"
    },
    {
      "commit": "d0d08382183edfb01246218950847b66bfcb1cc3",
      "tree": "622499834ca56063bb0ebb5a8ad70f26d188333d",
      "parents": [
        "61690a25f8deee67a92440fc5de1d50f3c8ebb48",
        "536eb852eb20d04ce3dbd8c46f79c94418a8fe38"
      ],
      "author": {
        "name": "Selim Cinek",
        "email": "cinek@google.com",
        "time": "Tue May 09 22:54:41 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 09 22:54:41 2017 +0000"
      },
      "message": "Merge \"Fixed the ordering of colorized media notifications\" into oc-dev am: 37079af46d\nam: 536eb852eb\n\nChange-Id: I146e53c3ac3404f75909a564d62e905a4ca70a10\n"
    },
    {
      "commit": "536eb852eb20d04ce3dbd8c46f79c94418a8fe38",
      "tree": "f273b40c6e48a0a6a6426185298cc51f73acde31",
      "parents": [
        "e4cc75de2c908d8077a240396c0c4807ddefa89a",
        "37079af46dcf050ed65d7fffe918054d05cb62b7"
      ],
      "author": {
        "name": "Selim Cinek",
        "email": "cinek@google.com",
        "time": "Tue May 09 21:20:22 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 09 21:20:22 2017 +0000"
      },
      "message": "Merge \"Fixed the ordering of colorized media notifications\" into oc-dev\nam: 37079af46d\n\nChange-Id: I1b3c6f23ed2dc8a0e5cb28badd53766b0d30a3ba\n"
    },
    {
      "commit": "37079af46dcf050ed65d7fffe918054d05cb62b7",
      "tree": "3b7b0a3ef632d4fd7df6a024e87b1698259294f5",
      "parents": [
        "36db49ecbf14d2651ad93b80a1cf9c3fbbe70857",
        "c6c639cb0641248f245538d4164bea6d4e0c2fc3"
      ],
      "author": {
        "name": "Selim Cinek",
        "email": "cinek@google.com",
        "time": "Tue May 09 21:06:58 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 09 21:07:03 2017 +0000"
      },
      "message": "Merge \"Fixed the ordering of colorized media notifications\" into oc-dev"
    },
    {
      "commit": "2cb09723407aeee1fe55363227ee9eb8cd5e6030",
      "tree": "294b706a5a1a4bdacdd0f11ee2f0d577a26f0e22",
      "parents": [
        "15e1828ba776adb8494439c4508085bc8b05a30b",
        "2af1fda3cac8f6f8fe1ee8860fef3106f2b1a4e4"
      ],
      "author": {
        "name": "Phil Weaver",
        "email": "pweaver@google.com",
        "time": "Tue May 09 16:46:34 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 09 16:46:34 2017 +0000"
      },
      "message": "Merge \"Fix crash in a11y cache\" into oc-dev am: 64d6e3e11d\nam: 2af1fda3ca\n\nChange-Id: Ib2aaaf46de7a402e34288ea9dcad45b9b2ba55eb\n"
    },
    {
      "commit": "2af1fda3cac8f6f8fe1ee8860fef3106f2b1a4e4",
      "tree": "e1c5adcfb9f7c8cf8bb8d47a719916f83ea57b9e",
      "parents": [
        "e99f3c3c77de7d7316b4f1e9adf835b0bc74a3a9",
        "64d6e3e11d477bc94815235e514187e0d9642c7f"
      ],
      "author": {
        "name": "Phil Weaver",
        "email": "pweaver@google.com",
        "time": "Tue May 09 16:20:06 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 09 16:20:06 2017 +0000"
      },
      "message": "Merge \"Fix crash in a11y cache\" into oc-dev\nam: 64d6e3e11d\n\nChange-Id: I86b25241a07ab47bc1c7e9a069867db90872ad4f\n"
    },
    {
      "commit": "64d6e3e11d477bc94815235e514187e0d9642c7f",
      "tree": "bde3d7a848d511332a38ccce151aea09a129ec7b",
      "parents": [
        "1b7e17b1350bb35f7cbfe1643b0694ee32429fa1",
        "61a1fabab68436de7315f0c4b5270b9c84e48667"
      ],
      "author": {
        "name": "Phil Weaver",
        "email": "pweaver@google.com",
        "time": "Tue May 09 15:30:24 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 09 15:30:30 2017 +0000"
      },
      "message": "Merge \"Fix crash in a11y cache\" into oc-dev"
    },
    {
      "commit": "a08220b8175bc008edc5a163007db1d04431a6be",
      "tree": "806d6432db53f459b3c11925453e198918d05977",
      "parents": [
        "abb3f115aa96de393d50cea0915e331fac683074"
      ],
      "author": {
        "name": "Artem Iglikov",
        "email": "artikz@google.com",
        "time": "Tue May 09 14:28:29 2017 +0100"
      },
      "committer": {
        "name": "Artem Iglikov",
        "email": "artikz@google.com",
        "time": "Tue May 09 15:42:05 2017 +0100"
      },
      "message": "Add tests for chooseRestorePolicy.\n\nBug: 38090803\nTest: runtest -p com.android.server.backup frameworks-services\nChange-Id: Iba0235f00ac0ba3150a8d3c77e27725a481c9c2b\n"
    },
    {
      "commit": "0fa80ba8fd8dfab72a0c410540532200712acb6e",
      "tree": "89181a30e1d8c5db50fd8d88e48276821620f2ca",
      "parents": [
        "abb3f115aa96de393d50cea0915e331fac683074",
        "507d11c9353666a75fee014565f900825a907691"
      ],
      "author": {
        "name": "Andrew Scull",
        "email": "ascull@google.com",
        "time": "Tue May 09 09:48:46 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 09 09:48:53 2017 +0000"
      },
      "message": "Merge \"Move LockSettingsService into locksettings package.\""
    },
    {
      "commit": "abb3f115aa96de393d50cea0915e331fac683074",
      "tree": "f885cf13dd196606c22ef21b39b7702c2c97739f",
      "parents": [
        "841b9ff53ddbb6aa49616d93cdbeb35eff11bc38",
        "13fffd267cd7026deff279c39dca9d981ed3e458"
      ],
      "author": {
        "name": "Artem Iglikov",
        "email": "artikz@google.com",
        "time": "Tue May 09 08:28:20 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 09 08:28:28 2017 +0000"
      },
      "message": "Merge \"Add some tests for TarBackupReader\""
    },
    {
      "commit": "9443af91675b6e4fc4029f37eb4ba4cf545e9eb2",
      "tree": "cecfcd6bd88349b652dc5e81eb620e39bf0745fd",
      "parents": [
        "3577338984401056b3ee5ceb2b77af6034066e52",
        "f14f5fa42f8ba6f9bd125896b30713820ef422c6"
      ],
      "author": {
        "name": "Wale Ogunwale",
        "email": "ogunwale@google.com",
        "time": "Tue May 09 03:05:20 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 09 03:05:20 2017 +0000"
      },
      "message": "Merge \"Merge \"Fixed issue with associating WindowToken with null binder.\" into oc-dev am: d193972a7f\" into oc-dev-plus-aosp\nam: f14f5fa42f\n\nChange-Id: I1934f8baa7f4e0c43a5d69c0a4d1b74a28407f5a\n"
    },
    {
      "commit": "4b31cfd6c71759c1371830be16d8e3234c99af49",
      "tree": "2a37044a1b76d7cd142490e474a2afa5230e4fe6",
      "parents": [
        "ec73b8a936d67dc620cfa3f2077d51993948ebce",
        "d193972a7fa6fe692f2a1c58c50dbc6ed22603c7"
      ],
      "author": {
        "name": "Wale Ogunwale",
        "email": "ogunwale@google.com",
        "time": "Tue May 09 02:48:59 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 09 02:48:59 2017 +0000"
      },
      "message": "Merge \"Fixed issue with associating WindowToken with null binder.\" into oc-dev\nam: d193972a7f\n\nChange-Id: I70b18aebd8ba5eb0cb8bac5c8bfdb4ca460885e1\n"
    },
    {
      "commit": "d193972a7fa6fe692f2a1c58c50dbc6ed22603c7",
      "tree": "0600275a71feb889663dab5f9a9bd79243aa3193",
      "parents": [
        "9f028643c29ef2e4c9c7f74a54dd21f6b612711a",
        "2f569ed618f0eb834efb7a27c57d8ca43bcf4f1b"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Tue May 09 02:39:55 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 09 02:39:59 2017 +0000"
      },
      "message": "Merge \"Fixed issue with associating WindowToken with null binder.\" into oc-dev"
    },
    {
      "commit": "2f569ed618f0eb834efb7a27c57d8ca43bcf4f1b",
      "tree": "56571115e34826a0a6edd1d3101f370ded7a1bbe",
      "parents": [
        "2880a4b41fd72ad4f5c2f56073a5e7942786df16"
      ],
      "author": {
        "name": "Wale Ogunwale",
        "email": "ogunwale@google.com",
        "time": "Mon May 08 09:15:49 2017 -0700"
      },
      "committer": {
        "name": "Wale Ogunwale",
        "email": "ogunwale@google.com",
        "time": "Mon May 08 11:52:15 2017 -0700"
      },
      "message": "Fixed issue with associating WindowToken with null binder.\n\nApp don\u0027t have to specify a LayoutParams.token when adding a window to\nthe system, however when they don\u0027t WM maps all the windows to a single\nWindowToken mapped to a null IBinder. This isn\u0027t correct since the\nwindows can be coming from different apps and also null binder shouldn\u0027t\nbe used to map tokens.\nWe now:\n1. Associate the WindowToken with the IWindow client for bookkeeping in\nWM if the app didn\u0027t specify LayoutParams.token for the window it is\nadding.\n2. Throw an illegal argumenet exception we we try to associate a null\nbinder with a window token or null window token with a binder on a\ndisplay.\n\nFixes: 38021710\nTest: Start an alert window, lock and unlock the phone, long press to\nbring up power dialog, and tap outside it to make sure it goes away.\n\nChange-Id: I6816b7fb9b9a0a8f5387062bada862eb75004e4f\n"
    },
    {
      "commit": "9a92a67a8783ed5a72d8abaee9541ba1f30aa000",
      "tree": "3e7d851dad70a4cc56e9ae14cd5cf6d854b4d15a",
      "parents": [
        "5f8bcd8b1b537927cf52a6bcc9a2bfda31d909ec",
        "d2767c45b008f0cbf1e85a8062da7551f54eb610"
      ],
      "author": {
        "name": "Justin Klaassen",
        "email": "justinklaassen@google.com",
        "time": "Mon May 08 18:50:16 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon May 08 18:50:16 2017 +0000"
      },
      "message": "Merge \"Night display status restored until valid state\" into oc-dev am: 2710490ac9\nam: d2767c45b0\n\nChange-Id: I1af9411b0338112c41112b54aee14f42412536f2\n"
    },
    {
      "commit": "d2767c45b008f0cbf1e85a8062da7551f54eb610",
      "tree": "d0dc06f66fc07cb2242e0aab2bb1f5c8c93bfd15",
      "parents": [
        "4b00db54927cbbeac859b660d6afe769a53e45e9",
        "2710490ac92cf527ed97dfd54fc59d90f40c00c0"
      ],
      "author": {
        "name": "Justin Klaassen",
        "email": "justinklaassen@google.com",
        "time": "Mon May 08 18:33:06 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Mon May 08 18:33:06 2017 +0000"
      },
      "message": "Merge \"Night display status restored until valid state\" into oc-dev\nam: 2710490ac9\n\nChange-Id: Ie1bcdaff64110ea0e3a6ec3ea14e1637c5390008\n"
    },
    {
      "commit": "13fffd267cd7026deff279c39dca9d981ed3e458",
      "tree": "05d8f844ec042f27adc6fc23f20f3fddeb85da4b",
      "parents": [
        "3494f15fc1dcc417dfa9c3389c8b463759a8b9d7"
      ],
      "author": {
        "name": "Artem Iglikov",
        "email": "artikz@google.com",
        "time": "Mon May 08 17:17:13 2017 +0100"
      },
      "committer": {
        "name": "Artem Iglikov",
        "email": "artikz@google.com",
        "time": "Mon May 08 19:15:59 2017 +0100"
      },
      "message": "Add some tests for TarBackupReader\n\n... and PerformAdbRestoreTask.\n\nInvolves some refactoring, splitting readAppManifest() into two methods.\n\nAlso a bit of cleanup: make private field actually private and use\nstatic imports for some constants.\n\nBug: 38090803\nBug: 37619463\nTest: runtest -p com.android.server.backup frameworks-services\nChange-Id: Ic30a6c5a515da1efb67caaae6eb75f4313797d5c\n"
    },
    {
      "commit": "3da4c44d73fa038c3f24ac1a25395469d4a91394",
      "tree": "ca50bcd0a924f357f9536cb9d8799c2a52431069",
      "parents": [
        "2880a4b41fd72ad4f5c2f56073a5e7942786df16"
      ],
      "author": {
        "name": "Justin Klaassen",
        "email": "justinklaassen@google.com",
        "time": "Fri May 05 15:19:33 2017 -0700"
      },
      "committer": {
        "name": "Justin Klaassen",
        "email": "justinklaassen@google.com",
        "time": "Mon May 08 13:31:58 2017 +0000"
      },
      "message": "Night display status restored until valid state\n\nFixes: 38013048\nTest: runtest -c com.android.server.NightDisplayServiceTest \\\n      frameworks-services\n\nChange-Id: I8dc4177f89727a29ee6ab8e3db5a23c8127b800c\n"
    },
    {
      "commit": "00229bc6cfd74c3221d02af6df07960a0f36af1a",
      "tree": "544f4014f488875b01994f521e03d540ea1cd658",
      "parents": [
        "547a7ec9dbbf38651c0fefc1c7577362de326496"
      ],
      "author": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Wed Mar 01 13:21:10 2017 +0000"
      },
      "committer": {
        "name": "Paul Duffin",
        "email": "paulduffin@google.com",
        "time": "Mon May 08 13:27:51 2017 +0100"
      },
      "message": "Prepare for removal of junit and android.test classes from Android API (step 1)\n\nIn preparation for removing junit and android.test classes from\nthe Android API this change adds explicit dependencies on junit\nand/or legacy-android-test to ensure that modules will compile\nproperly once it is removed.\n\nCare was taken to ensure that any targets that depended,\ndirectly or indirectly, on android-support-test did not also\ndepend on junit or hamcrest as they conflict with the versions\nembedded within android-support-test.\n\nBug: 30188076\nTest: make checkbuild\nChange-Id: Ifc3ee3dc804074a3c572bf2600cfb1fe1b6fa749\n"
    },
    {
      "commit": "c6c639cb0641248f245538d4164bea6d4e0c2fc3",
      "tree": "d7e224d9746c058685785dddbae1b778a77ec591",
      "parents": [
        "f323e3a5435ac21c6a5684e0aeba5f26ea699f9d"
      ],
      "author": {
        "name": "Selim Cinek",
        "email": "cinek@google.com",
        "time": "Fri May 05 19:49:22 2017 -0700"
      },
      "committer": {
        "name": "Selim Cinek",
        "email": "cinek@google.com",
        "time": "Fri May 05 19:49:22 2017 -0700"
      },
      "message": "Fixed the ordering of colorized media notifications\n\nPreviously colorized media notifications were downranked if they\nwere not foreground services. This could lead to bugs where\ncolorized notifications were ranked below non-colorized ones.\n\nTest: runtest systemui-notification\nBug: 38049452\nChange-Id: I8652de55acff0b03fa337478ad7ad463ecc4e82d\n"
    },
    {
      "commit": "ebe175c92f0b5e0ae4eb0231f6b75f56d7b21a0f",
      "tree": "e4e839bb589e023df549d506b6217f62fe2fd9ba",
      "parents": [
        "a23cbf0656728b531e047762636178faf3564691",
        "f14f38ba4aa0b6b990210afa8d9a0304e50d229b"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Fri May 05 20:24:45 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 05 20:24:45 2017 +0000"
      },
      "message": "Merge \"Show warning log when ShortcutInfo is re-published\" into oc-dev am: 9ccb15a351\nam: f14f38ba4a\n\nChange-Id: Idba763e56af1fa6e76ddbb3d8880f7eb78c944f3\n"
    },
    {
      "commit": "f14f38ba4aa0b6b990210afa8d9a0304e50d229b",
      "tree": "2206dcc27f42fd958e3fb645a1497521f9b0ed39",
      "parents": [
        "dd28278023104d99b52262427cc54318215408f1",
        "9ccb15a351c3732b4dd8f55eb100756b0f88a9e8"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Fri May 05 20:16:49 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 05 20:16:49 2017 +0000"
      },
      "message": "Merge \"Show warning log when ShortcutInfo is re-published\" into oc-dev\nam: 9ccb15a351\n\nChange-Id: I7f246f362b6e8d124416db790e4856e52baa21b8\n"
    },
    {
      "commit": "9ccb15a351c3732b4dd8f55eb100756b0f88a9e8",
      "tree": "f6620da3427380450006674837a395242808288f",
      "parents": [
        "52fbde52552b24bfe9757ee2e09731188a822809",
        "bf563b63e5d3672ec102ee191a301e49e472139b"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Fri May 05 20:11:02 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 05 20:11:08 2017 +0000"
      },
      "message": "Merge \"Show warning log when ShortcutInfo is re-published\" into oc-dev"
    },
    {
      "commit": "0a1438581a4458827cf28bd87f829467a4ba25f8",
      "tree": "72fa099fc7a4906c5a3011f591e14d715d743091",
      "parents": [
        "617a922a8969032fe49df73285799c3595a3f84a",
        "1e41528706132c6174ebfa3b726d5cefbb566c4a"
      ],
      "author": {
        "name": "Daniel Nishi",
        "email": "dhnishi@google.com",
        "time": "Fri May 05 19:27:28 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 05 19:27:28 2017 +0000"
      },
      "message": "Merge \"Use the StorageStatsManager in FileCollector.\" into oc-dev am: 4e9002e69a\nam: 1e41528706\n\nChange-Id: I80b58e892f8e10f52454f5377daa90b276827f44\n"
    },
    {
      "commit": "1e41528706132c6174ebfa3b726d5cefbb566c4a",
      "tree": "da36ec59788119ad32ba42cb22a8621f74af4b87",
      "parents": [
        "dccddf02a94048f99347f2856f56194ad024b17a",
        "4e9002e69a7fd24acd3aba5ee70a9d5ef17c1960"
      ],
      "author": {
        "name": "Daniel Nishi",
        "email": "dhnishi@google.com",
        "time": "Fri May 05 19:16:56 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 05 19:16:56 2017 +0000"
      },
      "message": "Merge \"Use the StorageStatsManager in FileCollector.\" into oc-dev\nam: 4e9002e69a\n\nChange-Id: Ief5f223fd09e6cb78e903276a2270c6fbae2e0cf\n"
    },
    {
      "commit": "294fae55e155590a74843151f5aee5134eb0f8a5",
      "tree": "1648ebaed4e2589e0bc15b8da070306d0b10448f",
      "parents": [
        "3198ccf4e40fc9992a93ab864ce7496a8736300a",
        "ad2f0735b807987d70f260a04983fe2d63944070"
      ],
      "author": {
        "name": "Geoffrey Pitsch",
        "email": "gpitsch@google.com",
        "time": "Fri May 05 19:07:18 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 05 19:07:18 2017 +0000"
      },
      "message": "Merge \"Revert \"Treat apps that use channels as O apps\"\" into oc-dev am: e2361d978b\nam: ad2f0735b8\n\nChange-Id: I4a4f6d3319ed7251ce5e3de1dece65ae62c72397\n"
    },
    {
      "commit": "ad2f0735b807987d70f260a04983fe2d63944070",
      "tree": "39b751c95182fbddacebe85ee6361a9429a9e7a0",
      "parents": [
        "8ddad99cd1cc31b658815f279677ed9046e62133",
        "e2361d978be6b0d5be134885285bff122395f8f8"
      ],
      "author": {
        "name": "Geoffrey Pitsch",
        "email": "gpitsch@google.com",
        "time": "Fri May 05 19:01:40 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 05 19:01:40 2017 +0000"
      },
      "message": "Merge \"Revert \"Treat apps that use channels as O apps\"\" into oc-dev\nam: e2361d978b\n\nChange-Id: I3364dd67095ffcf25a4d33e0c25cc93d2cc7aa50\n"
    },
    {
      "commit": "4e9002e69a7fd24acd3aba5ee70a9d5ef17c1960",
      "tree": "7bfa424cf985ed1214762fad6d55a61a970ea766",
      "parents": [
        "f57b93cd0a2289f32a035f43722546162fc17442",
        "5d230dc202cb03185652e12b3024ceea1132dd4d"
      ],
      "author": {
        "name": "Daniel Nishi",
        "email": "dhnishi@google.com",
        "time": "Fri May 05 18:57:41 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 05 18:57:47 2017 +0000"
      },
      "message": "Merge \"Use the StorageStatsManager in FileCollector.\" into oc-dev"
    },
    {
      "commit": "e2361d978be6b0d5be134885285bff122395f8f8",
      "tree": "6e98ddfe2d295a16759ef9a2cffdfcaef7d22500",
      "parents": [
        "73971b2a43bb406a3aa7aba83a322520695de40b",
        "a22f644c79213138c232f3067b5f780a9c43b04c"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri May 05 18:50:52 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 05 18:50:58 2017 +0000"
      },
      "message": "Merge \"Revert \"Treat apps that use channels as O apps\"\" into oc-dev"
    },
    {
      "commit": "d9c0bab0767433a3f0ac7c91d5a881441b8ecf23",
      "tree": "2b9957ac99a2a246559c85d1c0d19ba5b8df0345",
      "parents": [
        "d84319e0c6b5c5cdc1b9645bb928fd853928e718",
        "ffd0dd6981026f91d95acf65a8ef3debd3265867"
      ],
      "author": {
        "name": "Bryce Lee",
        "email": "brycelee@google.com",
        "time": "Fri May 05 16:54:46 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 05 16:54:46 2017 +0000"
      },
      "message": "Merge \"Prevent NPE in ActivityStack#shouldbeVisible.\" into oc-dev am: a087127e77\nam: ffd0dd6981\n\nChange-Id: I15263e86264b7cd167c67648ddea5cdce27913cf\n"
    },
    {
      "commit": "a22f644c79213138c232f3067b5f780a9c43b04c",
      "tree": "22cd9ec20e7dfedac80895f4145bb438914e05ef",
      "parents": [
        "07a08b2ae92cc26b5e7ec00064e6ecea79d3d9c3"
      ],
      "author": {
        "name": "Geoffrey Pitsch",
        "email": "gpitsch@google.com",
        "time": "Fri May 05 16:47:38 2017 +0000"
      },
      "committer": {
        "name": "Geoffrey Pitsch",
        "email": "gpitsch@google.com",
        "time": "Fri May 05 16:50:47 2017 +0000"
      },
      "message": "Revert \"Treat apps that use channels as O apps\"\n\nThis reverts commit 07a08b2ae92cc26b5e7ec00064e6ecea79d3d9c3.\nBug: 38016678\nChange-Id: I0bf2f6da9e145bfe1f79449cac38ad34f5956969\n"
    },
    {
      "commit": "ffd0dd6981026f91d95acf65a8ef3debd3265867",
      "tree": "366b1f14bdea87a2f0085d0c3dea1cddefd388d6",
      "parents": [
        "43a5185a437965ebf76a5ad3c7513b2461bcc531",
        "a087127e77dafb49c89de85549e1a61723cec6a7"
      ],
      "author": {
        "name": "Bryce Lee",
        "email": "brycelee@google.com",
        "time": "Fri May 05 16:46:20 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 05 16:46:20 2017 +0000"
      },
      "message": "Merge \"Prevent NPE in ActivityStack#shouldbeVisible.\" into oc-dev\nam: a087127e77\n\nChange-Id: I3c8bfb7fb2961dfef71b7903f78d20ff21f0dc84\n"
    },
    {
      "commit": "056156f616b882ddaf71042b2a8f42569c8740bc",
      "tree": "a3c0b6b914d2722a6d955f53f88917524d2e1071",
      "parents": [
        "fb19563972e775a3fafb3d781dab156d0b73580d"
      ],
      "author": {
        "name": "Neil Fuller",
        "email": "nfuller@google.com",
        "time": "Thu Mar 16 18:32:21 2017 +0000"
      },
      "committer": {
        "name": "Neil Fuller",
        "email": "nfuller@google.com",
        "time": "Fri May 05 17:09:58 2017 +0100"
      },
      "message": "Add (disabled) time zone update system server impl\n\nThis commit builds on top of prior API commits. It\nadds code to the system server, but in a disabled way.\n\nThe system server is responsible for monitoring two\n(configured) package names: one for the \"updater app\"\n(provided by the platform) and one for the \"data app\"\n(provided by the OEM). When either package changes\nthe updater app is triggered via a privileged\nintent.\n\nThe updater is then required to communicate with the\ndata app and report back to the system server.\n\nUnit tests are included for the major components.\n\nTo run:\nmake -j30 FrameworksServicesTests\nadb install -r -g \"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk\"\nadb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \\\n    \"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner\"\n\nThis contains a cherry-pick / conflict resolution of\ncommit 68f666693a465eb8a66d9252b7b7ac035b9f0b7b after an automerger skip.\n(cherry picked from commit 68f666693a465eb8a66d9252b7b7ac035b9f0b7b)\n\nTest: See above.\nBug: 31008728\nMerged-In: I8f82cdcc2b574778a7e0d0184270f305b69ee17b\nChange-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b\n"
    },
    {
      "commit": "943ebe705cece8f643d9d7ace005322ddf114d86",
      "tree": "cb2a022ed8ac4d61575c28e185e8edff7468f54e",
      "parents": [
        "f996c71431519e68645e652f90b4e9a5cf167874"
      ],
      "author": {
        "name": "Bryce Lee",
        "email": "brycelee@google.com",
        "time": "Thu May 04 10:19:07 2017 -0700"
      },
      "committer": {
        "name": "Bryce Lee",
        "email": "brycelee@google.com",
        "time": "Fri May 05 07:09:43 2017 -0700"
      },
      "message": "Prevent NPE in ActivityStack#shouldbeVisible.\n\nIf there is a visibleBehind activity, we check to see if the top\nactivity in the top stack is not fullscreen. However, it is possible\nfor the top stack to be empty. This can happen if the previously top\nactivity is being re-installed.\n\nThis changelist addresses the issue by checking if the top activity is\nnull before referencing it.\n\nChange-Id: I6de904bed1c7035ed1e112c9cacc1b6c2bac4e8f\nFixes: 32180256\nTest: bit FrameworksServicesTests:com.android.server.am.ActivityStackTests#testShouldBeVisibleWithVisibleBehindActivity\n"
    },
    {
      "commit": "953dca4c270a81c783f03af16aa73cfeae0bc76b",
      "tree": "93ead3fc0f45666b5b847d30ce4655879b31ffb1",
      "parents": [
        "acac2a75cfbcae9857252f7c5bffb6e97af1a0f8",
        "328532ab13768a6303231b670708d750c4d7aa5f"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri May 05 12:21:29 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 05 12:21:34 2017 +0000"
      },
      "message": "Merge \"Add (disabled) time zone update system server impl\""
    },
    {
      "commit": "b3f506aa5dd340077b9b0de80d127feb1c153968",
      "tree": "078e78031416e23293f59f66a1c7ab3750e99258",
      "parents": [
        "2dcec3ce91c81a3f3dcc55720ac0c022f935689f",
        "2dd109d2385e555491f58741db78a4ebb0dcbafa"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Fri May 05 11:24:51 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 05 11:24:57 2017 +0000"
      },
      "message": "Merge \"Add null checking and exception handling in selectBackupTransportAsync\""
    },
    {
      "commit": "914d4bf10f8ad7f04769b9a18d19cd3de8d886f2",
      "tree": "0b97680b0b26ec559a8b1b7df782976271f9e479",
      "parents": [
        "525044e9874a170eab8c6103ee1cb6a88130728d",
        "253984ed8c8f39fa0aa9c5f4addf2f44f334c749"
      ],
      "author": {
        "name": "Vladislav Kuzkokov",
        "email": "vkuzkokov@google.com",
        "time": "Fri May 05 09:36:45 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 05 09:36:51 2017 +0000"
      },
      "message": "Merge \"Store \"block uninstall\" flag separately from the rest of package state.\" into oc-dev"
    },
    {
      "commit": "e52323ea912d2c4d8736f34dad9fa654a7d3c2d4",
      "tree": "0b909d84109b9df56d2fcab09a36bc1bce7ee6d7",
      "parents": [
        "0e6990b60a78ca0a1bff4075d48e203d45de03a2",
        "8e0b16216d30b0254a96a948cee2a8bd1e2a1705"
      ],
      "author": {
        "name": "Aurimas Liutikas",
        "email": "aurimas@google.com",
        "time": "Fri May 05 01:07:33 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Fri May 05 01:07:33 2017 +0000"
      },
      "message": "Merge \"Avoid reflection when mocking UserManagerService\" into oc-dev am: bd886e52b8\nam: 8e0b16216d\n\nChange-Id: Id6723ff998ad4e40b527f6067c0b5301cfd070b3\n"
    },
    {
      "commit": "bd886e52b8e1f0f9592fd9390155e9f01bfc16f8",
      "tree": "1db8dac700030e601e28a55e02b2440750b17145",
      "parents": [
        "87b544c40650c077bb08418df45ca4592c2533fa",
        "2fbfb105eebfc3e45282c6b73451e6fafe32f717"
      ],
      "author": {
        "name": "Aurimas Liutikas",
        "email": "aurimas@google.com",
        "time": "Fri May 05 00:40:37 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Fri May 05 00:40:41 2017 +0000"
      },
      "message": "Merge \"Avoid reflection when mocking UserManagerService\" into oc-dev"
    },
    {
      "commit": "19980c93cb6e4b282ec8f09c92cd92b56a887167",
      "tree": "5bc9334e63780ad6448632890a69b43e9b372262",
      "parents": [
        "6c237720de31e8c608951f3b7814d480dcbee615",
        "8c0f813e4b667cd5f8f046e88d24ba4799459e7a"
      ],
      "author": {
        "name": "Julia Reynolds",
        "email": "juliacr@google.com",
        "time": "Thu May 04 21:15:03 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 04 21:15:03 2017 +0000"
      },
      "message": "Merge \"Remove notification settings for deleted users\" into oc-dev am: c50b731f0f\nam: 8c0f813e4b\n\nChange-Id: I2bc370910e4519d045f6a9498544a063189a2b50\n"
    },
    {
      "commit": "c50b731f0f57c0fe81bf65cd5408f7a3c2a6ca53",
      "tree": "eb620f9e19534cf999d640873dce83f4d0fb4528",
      "parents": [
        "07672353a57ceae60b67562acef6aa3a83805cb6",
        "2e9bf5fa7a2a27a16f0c2ef09030a0d5a7a13a8e"
      ],
      "author": {
        "name": "Julia Reynolds",
        "email": "juliacr@google.com",
        "time": "Thu May 04 20:54:14 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu May 04 20:54:19 2017 +0000"
      },
      "message": "Merge \"Remove notification settings for deleted users\" into oc-dev"
    },
    {
      "commit": "2fbfb105eebfc3e45282c6b73451e6fafe32f717",
      "tree": "8479c40d48cea35dd0946674ad886dc6d4b849cf",
      "parents": [
        "5fafafaba26c2a451e209a5b2da9c05c4b7c8201"
      ],
      "author": {
        "name": "Fyodor Kupolov",
        "email": "fkupolov@google.com",
        "time": "Thu May 04 12:22:25 2017 -0700"
      },
      "committer": {
        "name": "Fyodor Kupolov",
        "email": "fkupolov@google.com",
        "time": "Thu May 04 12:28:55 2017 -0700"
      },
      "message": "Avoid reflection when mocking UserManagerService\n\nFixed a crash due to a change in the private constructor signature\n\nTest: PackageManagerSettingsTests are passing\nBug: 37989886\nChange-Id: I5d46f6018b4bdb369b2e39ad3020235e7f2c5a2e\n"
    },
    {
      "commit": "328532ab13768a6303231b670708d750c4d7aa5f",
      "tree": "f80b792421915c135618e2a9b0f4142a7d47a911",
      "parents": [
        "009e77a7bb256def8100f432b608e888ca8dffd4"
      ],
      "author": {
        "name": "Neil Fuller",
        "email": "nfuller@google.com",
        "time": "Thu Mar 16 18:32:21 2017 +0000"
      },
      "committer": {
        "name": "Neil Fuller",
        "email": "nfuller@google.com",
        "time": "Thu May 04 19:28:49 2017 +0100"
      },
      "message": "Add (disabled) time zone update system server impl\n\nThis commit builds on top of prior API commits. It\nadds code to the system server, but in a disabled way.\n\nThe system server is responsible for monitoring two\n(configured) package names: one for the \"updater app\"\n(provided by the platform) and one for the \"data app\"\n(provided by the OEM). When either package changes\nthe updater app is triggered via a privileged\nintent.\n\nThe updater is then required to communicate with the\ndata app and report back to the system server.\n\nUnit tests are included for the major components.\n\nTo run:\nmake -j30 FrameworksServicesTests\nadb install -r -g \"out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk\"\nadb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \\\n    \"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner\"\n\nTest: See above.\nBug: 31008728\nChange-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b\n"
    },
    {
      "commit": "2dd109d2385e555491f58741db78a4ebb0dcbafa",
      "tree": "8b3154634c3b19fa5ef444820518f622d0730f98",
      "parents": [
        "b300217639c260389868a00a56df8d10f6ed3999"
      ],
      "author": {
        "name": "Tony Mak",
        "email": "tonymak@google.com",
        "time": "Thu May 04 11:42:31 2017 +0100"
      },
      "committer": {
        "name": "Tony Mak",
        "email": "tonymak@google.com",
        "time": "Thu May 04 18:29:15 2017 +0100"
      },
      "message": "Add null checking and exception handling in selectBackupTransportAsync\n\nBug: 37304539\n\nTest: bit FrameworksServicesTests:com.android.server.backup.TrampolineTest\n\nChange-Id: I01ffa25bfca6ca743220ee7277c2a6473c055bf1\n"
    },
    {
      "commit": "bf563b63e5d3672ec102ee191a301e49e472139b",
      "tree": "6ac1843b8f8304cdf6985b21b89cf280da55e424",
      "parents": [
        "9304756c285d6b4bec6d7bcea328f79bcebd987d"
      ],
      "author": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Thu May 04 10:25:30 2017 -0700"
      },
      "committer": {
        "name": "Makoto Onuki",
        "email": "omakoto@google.com",
        "time": "Thu May 04 10:28:47 2017 -0700"
      },
      "message": "Show warning log when ShortcutInfo is re-published\n\nBug 37986391\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests\n\nChange-Id: Id9ca30068440915d2e86850fe2ed3684c0ce2af8\n"
    },
    {
      "commit": "253984ed8c8f39fa0aa9c5f4addf2f44f334c749",
      "tree": "fabd212a4a3aff7b58072056797d218f68d90bf1",
      "parents": [
        "a20b6ba1f2727501eab7f5c8b34607a0c02b4a74"
      ],
      "author": {
        "name": "Vladislav Kuzkokov",
        "email": "vkuzkokov@google.com",
        "time": "Mon Oct 24 09:27:16 2016 +0200"
      },
      "committer": {
        "name": "Vladislav Kuzkokov",
        "email": "vkuzkokov@google.com",
        "time": "Thu May 04 15:54:08 2017 +0000"
      },
      "message": "Store \"block uninstall\" flag separately from the rest of package state.\n\nThis allows to set \"block uninstall\" prior to installation and avoid the\ninevitable race that happens when Device Policy app tries to force install and\nthen immediately block uninstall.\n\nBUG\u003d31043188\nTest: Block com.chrome.beta in TestDPC. install, fail to uninstall through adb, unblock, uninstall\n\nChange-Id: I5ffa2abcb003982eccfb77585c43b59532dd501d\n(cherry picked from commit 1fff9dcb9d0a4d7224ff8aa0f39e82df0b30152c)\n"
    },
    {
      "commit": "1307d25e25ab9aabf92d2f74cefb005f34751a55",
      "tree": "44ab70f4f4b38d35f12d4ba4205405b1eab1b767",
      "parents": [
        "d2b2fc7a3b9f6f4370f63f60a73093d3cb92f6e5",
        "1fff9dcb9d0a4d7224ff8aa0f39e82df0b30152c"
      ],
      "author": {
        "name": "Vladislav Kuzkokov",
        "email": "vkuzkokov@google.com",
        "time": "Thu May 04 14:40:59 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu May 04 14:41:06 2017 +0000"
      },
      "message": "Merge \"Store \"block uninstall\" flag separately from the rest of package state.\""
    },
    {
      "commit": "507d11c9353666a75fee014565f900825a907691",
      "tree": "92d5a00e0f70ad8613e74e8e6cbd6c7780a4b308",
      "parents": [
        "eff8ed36b4e2913388a442c70e78bd622143eeab"
      ],
      "author": {
        "name": "Andrew Scull",
        "email": "ascull@google.com",
        "time": "Wed May 03 17:19:01 2017 +0100"
      },
      "committer": {
        "name": "Andrew Scull",
        "email": "ascull@google.com",
        "time": "Thu May 04 14:46:28 2017 +0100"
      },
      "message": "Move LockSettingsService into locksettings package.\n\nThis service now has a large number of support classes so move them into\ntheir own package to keep things tidy and easier to refactor.\n\nBug: 37090873\nTest: runtest frameworks-services -c com.android.server.locksettings.LockSettingsServiceTests\nTest: runtest frameworks-services -c com.android.server.locksettings.LockSettingsShellCommandTest\nTest: runtest frameworks-services -c com.android.server.locksettings.SyntheticPasswordTests\nChange-Id: Ic3cd00e6565749defd74498a3491c3d9b914ad90\n"
    },
    {
      "commit": "23c6007ccfcb29174569204c78c8f75e0d78ffe1",
      "tree": "d9e7abccd576f878009e8a50db262e85376d0eb4",
      "parents": [
        "f40af1ccc0a93a37f00a37366ec4ba3525569120"
      ],
      "author": {
        "name": "Artem Iglikov",
        "email": "artikz@google.com",
        "time": "Thu May 04 12:13:58 2017 +0100"
      },
      "committer": {
        "name": "Artem Iglikov",
        "email": "artikz@google.com",
        "time": "Thu May 04 12:26:47 2017 +0100"
      },
      "message": "Add more tests for AppBackupUtils.\n\nAlso enable other utils tests on presubmit.\n\nTest: runtest -p com.android.server.backup frameworks-services\nBug: 37939902\nChange-Id: I7f54a6a3d4dfe14f4802af1788a4d3afe01372f2\n"
    },
    {
      "commit": "2ee3fb26de15bdbcb38f0bdd04b58ec48d6b3678",
      "tree": "c7d3f5b66005c47ba0959ed40fae53b95dc31fc5",
      "parents": [
        "64ce3d0a6bfa3f72159cf4760707c5abf35f6ebc",
        "12b334ea91ceb149d89132f5f4aed298d7c4cddc"
      ],
      "author": {
        "name": "Wale Ogunwale",
        "email": "ogunwale@google.com",
        "time": "Thu May 04 03:09:08 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Thu May 04 03:09:08 2017 +0000"
      },
      "message": "Merge \"Added TaskSnapshotCacheTest back to presubmit\" into oc-dev am: 2ecf42f96c\nam: 12b334ea91\n\nChange-Id: I66917e2ee500321dd1fb82930d152aa59aed620b\n"
    },
    {
      "commit": "2ecf42f96c9d9ee0d1c849cc8961d703dc037e10",
      "tree": "2d3971adf2c80964fcfccac25ffd2ad5b91b1b17",
      "parents": [
        "5fafafaba26c2a451e209a5b2da9c05c4b7c8201",
        "68e882ce7f64d12a61de4f0a27403ecb3b70efae"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Thu May 04 02:51:58 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Thu May 04 02:52:02 2017 +0000"
      },
      "message": "Merge \"Added TaskSnapshotCacheTest back to presubmit\" into oc-dev"
    },
    {
      "commit": "61a1fabab68436de7315f0c4b5270b9c84e48667",
      "tree": "a5b3b4f2180eb9727de56db42865a5a1ae69a9c0",
      "parents": [
        "da3dd7c0cf1fcd7e352c8f9e30519e85776c5662"
      ],
      "author": {
        "name": "Phil Weaver",
        "email": "pweaver@google.com",
        "time": "Wed May 03 13:55:51 2017 -0700"
      },
      "committer": {
        "name": "Phil Weaver",
        "email": "pweaver@google.com",
        "time": "Wed May 03 17:33:43 2017 -0700"
      },
      "message": "Fix crash in a11y cache\n\nCaused by bad data from an app where a node was its own ancestor.\nWhen the node changed, the copy in the cache was recycled while\nflushing the descendants. Now recovering more gracefully.\n\nBug: 37674439\nTest: Adding a unit test for this case, ran a11y cts and unit tests,\nverified that the app reporting bad data no longer crashes TalkBack.\nChange-Id: I10bc9df2b4821529334a19aa27719c1510187690\n"
    },
    {
      "commit": "5d230dc202cb03185652e12b3024ceea1132dd4d",
      "tree": "efdc73558c745cdbe6d2d686e9b5201989fb32bd",
      "parents": [
        "838e5f04bedac5546950bce8a3db188b29cc2af5"
      ],
      "author": {
        "name": "Daniel Nishi",
        "email": "dhnishi@google.com",
        "time": "Mon Apr 10 11:21:26 2017 -0700"
      },
      "committer": {
        "name": "Daniel Nishi",
        "email": "dhnishi@google.com",
        "time": "Wed May 03 17:20:56 2017 -0700"
      },
      "message": "Use the StorageStatsManager in FileCollector.\n\nThis should vastly improve the speed of the FileCollector and\nresolves the null context issue from the previous variant.\n\nChange-Id: I16a70cd0376511b095b1d7fe1c25e8df95263bc1\nFixes: 35807386\nTest: Existing tests continue to pass.\n"
    },
    {
      "commit": "8ba35dc5a6fac24208d729a65d276f00250bcf7d",
      "tree": "a88393462dc99c8599233082dc6d6c179bdb43b5",
      "parents": [
        "6d64bbdd475c5aed745a05ec7e411287b09f5455",
        "8cc43b6fa7c1bb8a0510ca6eb387eaa5b95f38c4"
      ],
      "author": {
        "name": "Jeremy Joslin",
        "email": "jjoslin@google.com",
        "time": "Wed May 03 23:13:26 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 03 23:13:26 2017 +0000"
      },
      "message": "Merge changes from topic \u0027allow_none_scorer\u0027 into oc-dev am: d05dda1d40\nam: 8cc43b6fa7\n\nChange-Id: Ic2a3783d255482d0ae889c7501c2cdaf90ea2fed\n"
    },
    {
      "commit": "d05dda1d40e2867825e6e4b35986f9c4ca1e98cf",
      "tree": "8a2fb249127badb633082a4130ed832af56bf9c8",
      "parents": [
        "c7642c3239ea489c0c73b89a89de5f36fea31762",
        "a9f933e53a6f4cf6152b0525cfafc602e5c3798f"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed May 03 22:57:07 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 03 22:57:16 2017 +0000"
      },
      "message": "Merge changes from topic \u0027allow_none_scorer\u0027 into oc-dev\n\n* changes:\n  Revert permission check on setActiveScorer.\n  Allow the active scorer to be set to NULL.\n"
    },
    {
      "commit": "13e82946387070816b03be4d01e14205dc9992d8",
      "tree": "fcb5a677e4a6b010a8725b84a8c3a507b854adcf",
      "parents": [
        "53ea82ea3e6850dec47924ff5d454f0eaf2e07f3",
        "66ff1d62c02cd70d660b0fa99715c711faa635e9"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed May 03 18:40:03 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 03 18:40:09 2017 +0000"
      },
      "message": "Merge \"Add unit tests for com.android.server.backup.utils\""
    },
    {
      "commit": "0767c5ed6417630dc6d1afd76db1a18b996e7ed6",
      "tree": "2013cc31876eadb607339e630c42a239421e54f5",
      "parents": [
        "0a0570584e0a9d241825847adeab9095fd81184d",
        "b928547fc5cae3aa484131b68391d61d19440138"
      ],
      "author": {
        "name": "Jorim Jaggi",
        "email": "jjaggi@google.com",
        "time": "Wed May 03 17:44:29 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 03 17:44:29 2017 +0000"
      },
      "message": "Merge \"Fix snapshots for secure windows\" into oc-dev am: bf08eb6da7\nam: b928547fc5\n\nChange-Id: Ibc89f418354db1c7bdd57a9ee3b584570354bff5\n"
    },
    {
      "commit": "bf08eb6da7d37b9ef035975068187905afe2d975",
      "tree": "f00dbf878ffc7ed42200e09a56f0ad91164c30fc",
      "parents": [
        "e4e953ae4c42c10efe0c578a8dcfa5726bf8c6f7",
        "d635a4ae20014b6ff52d8b05e7f4f622808d4efd"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed May 03 17:29:16 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 03 17:29:21 2017 +0000"
      },
      "message": "Merge \"Fix snapshots for secure windows\" into oc-dev"
    },
    {
      "commit": "2e9bf5fa7a2a27a16f0c2ef09030a0d5a7a13a8e",
      "tree": "495fdd0bf03dd27a3bfb28033bd58476d69e84e1",
      "parents": [
        "e4e953ae4c42c10efe0c578a8dcfa5726bf8c6f7"
      ],
      "author": {
        "name": "Julia Reynolds",
        "email": "juliacr@google.com",
        "time": "Wed May 03 13:23:30 2017 -0400"
      },
      "committer": {
        "name": "Julia Reynolds",
        "email": "juliacr@google.com",
        "time": "Wed May 03 13:27:29 2017 -0400"
      },
      "message": "Remove notification settings for deleted users\n\nTest: runtest systemui-notification, manual\nChange-Id: I221554479cf6bedb36b17d5e9bbc05307af9b89b\nFixes: 37941356\n"
    },
    {
      "commit": "68e882ce7f64d12a61de4f0a27403ecb3b70efae",
      "tree": "498458e58061f73393ac7ea26b5f2d94a1a0d52d",
      "parents": [
        "251894b134a3d1d2bcba5ff9db7e3a4014cd369a"
      ],
      "author": {
        "name": "Wale Ogunwale",
        "email": "ogunwale@google.com",
        "time": "Wed May 03 07:54:23 2017 -0700"
      },
      "committer": {
        "name": "Wale Ogunwale",
        "email": "ogunwale@google.com",
        "time": "Wed May 03 10:18:40 2017 -0700"
      },
      "message": "Added TaskSnapshotCacheTest back to presubmit\n\nThe problem the test was having was fixed by ag/2179887\n\nAlso, fixed NPE during test tear down.\n\nChange-Id: I974fcb9a12928dd4494525f9bae5c7c448657e30\nFixes: 35196891\nBug: 37682538\nTest: TaskSnapshotCacheTest\n"
    },
    {
      "commit": "3fcdfa1b96b796de9be559e3d6c8c143fb8e3e05",
      "tree": "89f472fe9fe66400589e17d524da0f89286a21f5",
      "parents": [
        "438931ab9a73d5e96374d324d6d5e35a0ec88e91",
        "0bd001e95c02ea5d669071ea9ccb9ae54a51394a"
      ],
      "author": {
        "name": "Christine Franks",
        "email": "christyfranks@google.com",
        "time": "Wed May 03 17:14:52 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 03 17:14:52 2017 +0000"
      },
      "message": "Merge \"Night display status restores on reboot/user change\" into oc-dev am: 78e03b44c3\nam: 0bd001e95c\n\nChange-Id: I83536aa49173091ed5fe8ad96e8f752a5313ef93\n"
    },
    {
      "commit": "036bf8e18b730fe1bf3347ddb9264a9ae5825c60",
      "tree": "1c7db29f579f383589c88f93d4fa0ab47263a5d8",
      "parents": [
        "4078f993baeb9c745c835b24eee6bf2c6dc9ecab",
        "65c95aab0553d6971da6b6fbd4cc276d755ff003"
      ],
      "author": {
        "name": "Julia Reynolds",
        "email": "juliacr@google.com",
        "time": "Wed May 03 17:07:34 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 03 17:07:34 2017 +0000"
      },
      "message": "Merge \"Treat apps that use channels as O apps\" into oc-dev am: b0744b820a\nam: 65c95aab05\n\nChange-Id: I7c71490236b10229b9592e57511a8f7e4679be49\n"
    },
    {
      "commit": "78e03b44c352f399d7912cb7824e98d5a3af5cb7",
      "tree": "5a16278ffec52f6e9a640fd0cc76809c7acf929e",
      "parents": [
        "b0744b820aa87565d63cf003e08fa4c80ad92277",
        "e5bb03e2ea8cf0d7ab98fb6e6f8db1007d8d48d2"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Wed May 03 17:02:10 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 03 17:02:15 2017 +0000"
      },
      "message": "Merge \"Night display status restores on reboot/user change\" into oc-dev"
    },
    {
      "commit": "66ff1d62c02cd70d660b0fa99715c711faa635e9",
      "tree": "970aa69f033068730ce36055ae6e359042063bb3",
      "parents": [
        "6c2f7870bcd444ccf910a3c3b5bc8fb19f2bf2e2"
      ],
      "author": {
        "name": "Artem Iglikov",
        "email": "artikz@google.com",
        "time": "Wed May 03 15:06:59 2017 +0100"
      },
      "committer": {
        "name": "Artem Iglikov",
        "email": "artikz@google.com",
        "time": "Wed May 03 16:36:21 2017 +0100"
      },
      "message": "Add unit tests for com.android.server.backup.utils\n\nAlso add missing javadocs to some new classes.\n\nBug: 37939902\nTest: runtest -p com.android.server.backup frameworks-services\nChange-Id: I7c24cec754af9ea6caee7791a11085b8c174c427\n"
    },
    {
      "commit": "d635a4ae20014b6ff52d8b05e7f4f622808d4efd",
      "tree": "00ffe50ef7a96f30ca08437dfff1c6627e1b3965",
      "parents": [
        "0c21500920cac1e736f877e950e28eaa0b8b3f81"
      ],
      "author": {
        "name": "Jorim Jaggi",
        "email": "jjaggi@google.com",
        "time": "Wed May 03 15:21:26 2017 +0200"
      },
      "committer": {
        "name": "Jorim Jaggi",
        "email": "jjaggi@google.com",
        "time": "Wed May 03 17:20:40 2017 +0200"
      },
      "message": "Fix snapshots for secure windows\n\nFirst, also draw system bar backgrounds when drawing a fake\nsnapshot. For that, refactor the drawing into a separate class so\nit can be reused. Also enable fake snapshots for secure windows.\n\nTest: com.android.server.wm.TaskSnapshotControllerTest\nTest: com.android.server.wm.TaskSnapshotSurfaceTest\nTest: Secure activity with resuming delay, make sure system bars\nare covered when reopening app.\n\nBug: 35710126\nChange-Id: I2f0ebc7e7acb80015780a4e882f0a472599efa30\n"
    },
    {
      "commit": "1fff9dcb9d0a4d7224ff8aa0f39e82df0b30152c",
      "tree": "771ba6c3410b97fa774fda811d5fe1204f493376",
      "parents": [
        "71419a14131dc298a1580213dbdec30253bcf171"
      ],
      "author": {
        "name": "Vladislav Kuzkokov",
        "email": "vkuzkokov@google.com",
        "time": "Mon Oct 24 09:27:16 2016 +0200"
      },
      "committer": {
        "name": "Vladislav Kuzkokov",
        "email": "vkuzkokov@google.com",
        "time": "Wed May 03 17:13:14 2017 +0200"
      },
      "message": "Store \"block uninstall\" flag separately from the rest of package state.\n\nThis allows to set \"block uninstall\" prior to installation and avoid the\ninevitable race that happens when Device Policy app tries to force install and\nthen immediately block uninstall.\n\nBUG\u003d31043188\nTest: Block com.chrome.beta in TestDPC. install, fail to uninstall through adb, unblock, uninstall\n\nChange-Id: I5ffa2abcb003982eccfb77585c43b59532dd501d\n"
    },
    {
      "commit": "e5bb03e2ea8cf0d7ab98fb6e6f8db1007d8d48d2",
      "tree": "1016464e2fc5df5543dfe2dc8103e39f6d563857",
      "parents": [
        "40d0f8678347a40e750a8349e923a1dd2545c4e4"
      ],
      "author": {
        "name": "Christine Franks",
        "email": "christyfranks@google.com",
        "time": "Fri Feb 10 17:36:10 2017 -0800"
      },
      "committer": {
        "name": "Justin Klaassen",
        "email": "justinklaassen@google.com",
        "time": "Wed May 03 15:00:43 2017 +0000"
      },
      "message": "Night display status restores on reboot/user change\n\nFixes: 30086742\nTest: runtest -c com.android.server.NightDisplayServiceTest \\\n      frameworks-services\nChange-Id: I264be077e607baf8e19496f0c57549a907668005\n"
    },
    {
      "commit": "07a08b2ae92cc26b5e7ec00064e6ecea79d3d9c3",
      "tree": "ddf5cf7a145bd4b5d69b9447972f0fecec77471f",
      "parents": [
        "2445037bb9a98fd00bfa14c5b99b09026e8ffed7"
      ],
      "author": {
        "name": "Julia Reynolds",
        "email": "juliacr@google.com",
        "time": "Mon May 01 09:20:30 2017 -0400"
      },
      "committer": {
        "name": "Julia Reynolds",
        "email": "juliacr@google.com",
        "time": "Wed May 03 10:36:12 2017 -0400"
      },
      "message": "Treat apps that use channels as O apps\n\n... even if they don\u0027t target O\n\n- Delete misc channel\n- Read settings from channel instead of notification\n\nTest: runtest systemui-notification\nChange-Id: I00814959eddd10998806dd67cc30421091ae9aab\nFixes: 37540996\nFixes: 35378789\n"
    },
    {
      "commit": "85ec45ba276232c66ec12e0f4fe14b1559ef472b",
      "tree": "b812583c173f932495078bfff691f9003300d85a",
      "parents": [
        "287e90df53e948e999b6983e5ce421dca9df7445",
        "29fecaf2a6e26102d87bf0333102001c7895e32f"
      ],
      "author": {
        "name": "Geoffrey Pitsch",
        "email": "gpitsch@google.com",
        "time": "Wed May 03 13:26:43 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Wed May 03 13:26:43 2017 +0000"
      },
      "message": "Merge \"Delete default channel for all apps targeting O.\" into oc-dev am: b9ee2d4677\nam: 29fecaf2a6\n\nChange-Id: I2032881d163f6ba08d3d288dbdfbd8d0cb70f321\n"
    },
    {
      "commit": "b9ee2d4677aa48045a770a899661f96053e66926",
      "tree": "8399598bb59d23b5351354680233ee6a838ba399",
      "parents": [
        "d30044407e631854bebd089b6f61f3a5fbcb5248",
        "5644ccd1855e0ee14f1f5a5f1ac2490fa414af71"
      ],
      "author": {
        "name": "Geoffrey Pitsch",
        "email": "gpitsch@google.com",
        "time": "Wed May 03 13:15:16 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Wed May 03 13:15:21 2017 +0000"
      },
      "message": "Merge \"Delete default channel for all apps targeting O.\" into oc-dev"
    },
    {
      "commit": "3296999a198a7fa8ef1c1997af68a46fd7aa6edf",
      "tree": "a0fb12137fd96429206a1ead4f7866144dd21c3d",
      "parents": [
        "c6d132c11db904238302b7d2199fa2d9995e8390",
        "19ac164d1ba25751da317807a149cb46e65d827f"
      ],
      "author": {
        "name": "Wale Ogunwale",
        "email": "ogunwale@google.com",
        "time": "Tue May 02 20:37:30 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 02 20:37:30 2017 +0000"
      },
      "message": "Merge \"Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays\" into oc-dev am: 5f0e436548\nam: 19ac164d1b\n\nChange-Id: Ie7a6c7341725c6d63da0e9861d059c6bd3ad6281\n"
    },
    {
      "commit": "5f0e436548ea3bd10cef480c194da7da6080ac1e",
      "tree": "59ee9d43883e36c4cc26454cdbc8d71b99db75d3",
      "parents": [
        "3cb61255abad0d9426e80261f0c38b02937f33fb",
        "42bab7897f16c884d5c40ccc8a09f3e9f3338a65"
      ],
      "author": {
        "name": "Wale Ogunwale",
        "email": "ogunwale@google.com",
        "time": "Tue May 02 20:23:43 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 02 20:23:49 2017 +0000"
      },
      "message": "Merge \"Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays\" into oc-dev"
    },
    {
      "commit": "f1c454887a2f323fdb53a7fec52c41cf55dbcd35",
      "tree": "052f53f2fd7a2a229a54ebe13035976bdf92b8fb",
      "parents": [
        "bf0a3ec0faac4f95f0bc88ab470f33d5b5c7d5b7",
        "ef8ba7dc61df27c264a71b6ec9efb1e317d76726"
      ],
      "author": {
        "name": "Geoffrey Pitsch",
        "email": "gpitsch@google.com",
        "time": "Tue May 02 20:20:58 2017 +0000"
      },
      "committer": {
        "name": "android-build-merger",
        "email": "android-build-merger@google.com",
        "time": "Tue May 02 20:20:58 2017 +0000"
      },
      "message": "Merge \"Fix cancel when the same notification is enqueued twice.\" into oc-dev am: 67ced6c08f\nam: ef8ba7dc61\n\nChange-Id: I5fa7da9a5779220deeaf00e00a5cbf3eca0a5ca5\n"
    },
    {
      "commit": "42bab7897f16c884d5c40ccc8a09f3e9f3338a65",
      "tree": "a3b3ff35f1c236c1c6d867b62cfba5f5595bc272",
      "parents": [
        "22c1275c89d4975cbae3c49913aa5693b544628f"
      ],
      "author": {
        "name": "Wale Ogunwale",
        "email": "ogunwale@google.com",
        "time": "Tue May 02 13:16:39 2017 -0700"
      },
      "committer": {
        "name": "Wale Ogunwale",
        "email": "ogunwale@google.com",
        "time": "Tue May 02 13:16:39 2017 -0700"
      },
      "message": "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays\n\nReduce pre-submit noise. We can re-enable once we figure-out why it\nis flaky.\n\nBug: 37908381\nTest: disabled!\nChange-Id: Ia82ba73fafafc433487027f2ee2d582dceb65ed2\n"
    },
    {
      "commit": "5644ccd1855e0ee14f1f5a5f1ac2490fa414af71",
      "tree": "0fbc83592eecf8bf504790ef7614310fbfc33d20",
      "parents": [
        "dce4dfc6fce225f0bf9c14be8cfe6b93453864d1"
      ],
      "author": {
        "name": "Geoffrey Pitsch",
        "email": "gpitsch@google.com",
        "time": "Mon Apr 17 11:33:24 2017 -0400"
      },
      "committer": {
        "name": "Geoffrey Pitsch",
        "email": "gpitsch@google.com",
        "time": "Tue May 02 16:06:19 2017 -0400"
      },
      "message": "Delete default channel for all apps targeting O.\n\nChange toast to be for debuggable builds only.\n\nBug: 35378789\nTest: runtest systemui-notification\nChange-Id: I36247b003ead00bf1f9f3bed9c1a38a53db18c71\n"
    },
    {
      "commit": "67ced6c08f0d9bb7a6c5b90c83d3b4753dcc508d",
      "tree": "669aac0d768070d3a3098b260cb7bfe2996bf25d",
      "parents": [
        "89bc8b17d647387911800878f58dec5b1d18ce80",
        "27684159c6529937a3e2764a672f550ae9dbf5d7"
      ],
      "author": {
        "name": "TreeHugger Robot",
        "email": "treehugger-gerrit@google.com",
        "time": "Tue May 02 20:02:13 2017 +0000"
      },
      "committer": {
        "name": "Android (Google) Code Review",
        "email": "android-gerrit@google.com",
        "time": "Tue May 02 20:02:19 2017 +0000"
      },
      "message": "Merge \"Fix cancel when the same notification is enqueued twice.\" into oc-dev"
    },
    {
      "commit": "a9f933e53a6f4cf6152b0525cfafc602e5c3798f",
      "tree": "fbc713109dd31730841e80128b8078564a32f925",
      "parents": [
        "7aa0b0d94e577cb0e9620f0ea53ed37795be7e52"
      ],
      "author": {
        "name": "Jeremy Joslin",
        "email": "jjoslin@google.com",
        "time": "Fri Apr 28 13:08:17 2017 -0700"
      },
      "committer": {
        "name": "Jeremy Joslin",
        "email": "jjoslin@google.com",
        "time": "Tue May 02 12:23:05 2017 -0700"
      },
      "message": "Revert permission check on setActiveScorer.\n\nReverted to the pre-O behavior of allowing the call if the caller\nhas the SCORE_NETWORKS permission.\n\nTest: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest\nBug: 37722313\nChange-Id: I54a99dde364d6a5c88d35072922020542c6ae003\n"
    },
    {
      "commit": "7aa0b0d94e577cb0e9620f0ea53ed37795be7e52",
      "tree": "39cf18ded081c7322f3e816073f71ea2b56b0fe4",
      "parents": [
        "dd8a71f4a9b363bcbb50e4af5ea8ec9ceff546c6"
      ],
      "author": {
        "name": "Jeremy Joslin",
        "email": "jjoslin@google.com",
        "time": "Thu Apr 27 13:32:49 2017 -0700"
      },
      "committer": {
        "name": "Jeremy Joslin",
        "email": "jjoslin@google.com",
        "time": "Tue May 02 12:19:52 2017 -0700"
      },
      "message": "Allow the active scorer to be set to NULL.\n\nSetting the scorer to NULL will disable scoring/recommendations.\n\nTest: runtest frameworks-services -c com.android.server.NetworkScorerAppManagerTest\nBug: 37722313\nChange-Id: I8bdc43aa80cc2d6668ffa24389a8e4e9aaf95bd6\n"
    },
    {
      "commit": "27684159c6529937a3e2764a672f550ae9dbf5d7",
      "tree": "f1c492470330ac193f61a4929df6228aee5509ec",
      "parents": [
        "030107f0bdebb1d52838baab87b5d0146e6586b4"
      ],
      "author": {
        "name": "Geoffrey Pitsch",
        "email": "gpitsch@google.com",
        "time": "Tue May 02 11:41:31 2017 -0400"
      },
      "committer": {
        "name": "Geoffrey Pitsch",
        "email": "gpitsch@google.com",
        "time": "Tue May 02 13:28:51 2017 -0400"
      },
      "message": "Fix cancel when the same notification is enqueued twice.\n\nChange-Id: I6563c70ac441ff1c1951d5220c2e6a7c5f210d49\nFixes: 37706685\nTest: runtest systemui-notification\n"
    },
    {
      "commit": "8b20b2c2ec33416224fbee5b3dd83c6fd195557d",
      "tree": "5e992837367a2115c188971ac8309568ce6041a4",
      "parents": [
        "eff8ed36b4e2913388a442c70e78bd622143eeab"
      ],
      "author": {
        "name": "Tony Mak",
        "email": "tonymak@google.com",
        "time": "Tue May 02 14:15:10 2017 +0100"
      },
      "committer": {
        "name": "Tony Mak",
        "email": "tonymak@google.com",
        "time": "Tue May 02 14:28:04 2017 +0100"
      },
      "message": "selectBackupTransportAsync should report failure when backup is disabled\n\nFix: 37304539\nTest: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java\nTest: setup device owner, then set up profile.\n      Ensure tapping Settings-\u003eGoogle-\u003eWork-\u003eSecurity -\u003e Verify app\n      is working\n\nChange-Id: I393308857ea6082dca167e3e417b946615a83c20\n"
    }
  ],
  "next": "66e952bd2d317e7902cb2ac80d831fb1dbfd9b50"
}
