)]}' { "log": [ { "commit": "0bb60e7f96c0eb2095f75cb050c676006e03317b", "tree": "2741dd73c7242689a151b84ff121e8dd24b29c4c", "parents": [ "2cfee4c9cfc4ada6a72d55b1d7f97e14ecffbd3e", "9e6abebb10581d1288e14e56ef9d583afc6db191" ], "author": { "name": "Wale Ogunwale", "email": "ogunwale@google.com", "time": "Wed Sep 05 17:47:44 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 05 17:47:44 2018 -0700" }, "message": "Merge changes from topic \"am-bada3a56-09dc-47f9-ba2e-42434cf270e2\" into oc-dev am: 59113c7a51\nam: 9e6abebb10\n\nChange-Id: Ifb11c9795b60056fa3407085d33b8a98a704b4e2\n" }, { "commit": "2cfee4c9cfc4ada6a72d55b1d7f97e14ecffbd3e", "tree": "2741dd73c7242689a151b84ff121e8dd24b29c4c", "parents": [ "4c0878bf747c2c377666763cec85fa82b23cb706", "40f7b5832291ec81b921d9d7598447653d926604" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 05 23:01:36 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 05 23:01:36 2018 +0000" }, "message": "Merge \"RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.\" into oc-mr1-dev" }, { "commit": "9e6abebb10581d1288e14e56ef9d583afc6db191", "tree": "f39f8cfece93741891a542f9b3834b31bb3dad71", "parents": [ "15682d0bd479d093ebb4003c70fb3baf6e16b525", "59113c7a51dcda93e2d1cb2217b1b9fc4cd66c89" ], "author": { "name": "Wale Ogunwale", "email": "ogunwale@google.com", "time": "Wed Sep 05 15:57:16 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 05 15:57:16 2018 -0700" }, "message": "Merge changes from topic \"am-bada3a56-09dc-47f9-ba2e-42434cf270e2\" into oc-dev\nam: 59113c7a51\n\nChange-Id: I8111a46aaff0d20c4f1cc51292eb9567b196a5fa\n" }, { "commit": "4c0878bf747c2c377666763cec85fa82b23cb706", "tree": "bc3f13ab37f4288b830ae5f08d6bb541e15038c1", "parents": [ "cc22fcc2959dd62572a8b5a84851134cea506014", "15682d0bd479d093ebb4003c70fb3baf6e16b525" ], "author": { "name": "akirilov", "email": "akirilov@google.com", "time": "Wed Sep 05 15:38:25 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 05 15:38:25 2018 -0700" }, "message": "[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83 skipped: 879ecd17ab am: 47a4d99c0c\nam: 15682d0bd4\n\nChange-Id: I248cce38784bf8ed892f2f3451e000b573770f6e\n" }, { "commit": "59113c7a51dcda93e2d1cb2217b1b9fc4cd66c89", "tree": "5b481a7593e8c02733710ad3e4dc12dad606548e", "parents": [ "47a4d99c0cfbd62dda68fc5d06d2cf317f21e9c3", "f8a7028b23772d82fd2b13d16f9c6e7ac6c6ae19" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 05 22:24:16 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 05 22:24:16 2018 +0000" }, "message": "Merge changes from topic \"am-bada3a56-09dc-47f9-ba2e-42434cf270e2\" into oc-dev\n\n* changes:\n [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e skipped: 2e5c1ed2ad\n [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e\n [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5\n [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009\n RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.\n" }, { "commit": "15682d0bd479d093ebb4003c70fb3baf6e16b525", "tree": "f39f8cfece93741891a542f9b3834b31bb3dad71", "parents": [ "dff5d48b7eb2b527e998a9f3ff794ccd9539b85d", "47a4d99c0cfbd62dda68fc5d06d2cf317f21e9c3" ], "author": { "name": "akirilov", "email": "akirilov@google.com", "time": "Wed Sep 05 15:18:01 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Sep 05 15:18:01 2018 -0700" }, "message": "[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83 skipped: 879ecd17ab\nam: 47a4d99c0c\n\nChange-Id: I92cf75e9261fdf866687dc31632714be257ca7f7\n" }, { "commit": "40f7b5832291ec81b921d9d7598447653d926604", "tree": "2741dd73c7242689a151b84ff121e8dd24b29c4c", "parents": [ "cc22fcc2959dd62572a8b5a84851134cea506014" ], "author": { "name": "Wale Ogunwale", "email": "ogunwale@google.com", "time": "Wed May 16 16:42:29 2018 -0700" }, "committer": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Wed Sep 05 20:40:23 2018 +0000" }, "message": "RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.\n\n1: Cherry-pick ag/4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS\nupdateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow\n\n2: Cherry-pick ag/3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on\nrelayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded\n\n3: Add permissions to SystemUI to allow it to hide non-system overlays\n\nBug: 34170870\nTest: manual (see bug for poc)\nChange-Id: I57cb0f390d9a78e721c5ddce49a377d385002753\n" }, { "commit": "f8a7028b23772d82fd2b13d16f9c6e7ac6c6ae19", "tree": "5b481a7593e8c02733710ad3e4dc12dad606548e", "parents": [ "5b78b0015e0ce0d16358409cae60eedf5ff7212f", "2e5c1ed2adf4aa7d57d6178572282e3e07d6a435" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Sep 05 20:39:21 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Sep 05 20:39:21 2018 +0000" }, "message": "[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e skipped: 2e5c1ed2ad\n\nChange-Id: Iaec0b5ba5b3adeb6ac1150c7e2cc5534432def11\n" }, { "commit": "2e5c1ed2adf4aa7d57d6178572282e3e07d6a435", "tree": "78bf1c802631ca81b98ff244d61bfea5887fb8c5", "parents": [ "9ea0739c99036ad74a1180d51a39d1c3b553b388", "3290f3b22e07f4a1bc15e23a6e5a27866286c7bd" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Sep 05 20:39:13 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Sep 05 20:39:13 2018 +0000" }, "message": "[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e\n\nChange-Id: If7b764f16eaf2bdc7f5327351e74458fad48d250\n" }, { "commit": "3290f3b22e07f4a1bc15e23a6e5a27866286c7bd", "tree": "b8f0b0ca06307f831bbcf0708891d2485f7e73b8", "parents": [ "3504302bb2780de95cde848f191dde7fedf7431c", "7ee280f8b54cf90cb9afc67a074238ce89d00faf" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Sep 05 20:39:05 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Sep 05 20:39:05 2018 +0000" }, "message": "[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5\n\nChange-Id: Ic52ca75008a7a428fae62f9e1adc861ec51abc09\n" }, { "commit": "7ee280f8b54cf90cb9afc67a074238ce89d00faf", "tree": "34b3347035870823e36c3aa74e4587a4bc574779", "parents": [ "00751399025110fa9cf0498fbdfb470170db3032", "295af3600912691ed737714462e64db43198d448" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Sep 05 20:38:53 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Sep 05 20:38:53 2018 +0000" }, "message": "[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009\n\nChange-Id: I277a26c94cde1e77ddef8ddbc81dad3c963def8f\n" }, { "commit": "295af3600912691ed737714462e64db43198d448", "tree": "8a1dbbf3b097f299d17692fe3bd7e0f55d89e2a9", "parents": [ "1425bb41aa61eaf10c93c5f153da131ac9f86a74" ], "author": { "name": "Wale Ogunwale", "email": "ogunwale@google.com", "time": "Wed May 16 16:42:29 2018 -0700" }, "committer": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Wed Sep 05 20:38:50 2018 +0000" }, "message": "RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.\n\n1: Cherry-pick ag/4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS\nupdateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow\n\n2: Cherry-pick ag/3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on\nrelayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded\n\n3: Add permissions to SystemUI to allow it to hide non-system overlays\n\nBug: 34170870\nTest: manual (see bug for poc)\nChange-Id: I57cb0f390d9a78e721c5ddce49a377d385002753\n" }, { "commit": "47a4d99c0cfbd62dda68fc5d06d2cf317f21e9c3", "tree": "5b481a7593e8c02733710ad3e4dc12dad606548e", "parents": [ "5b78b0015e0ce0d16358409cae60eedf5ff7212f", "879ecd17ab1e9645a9fff994e856fabeb68c8f96" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 24 22:45:45 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 24 22:45:45 2018 +0000" }, "message": "[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83 skipped: 879ecd17ab\n\nChange-Id: I8aa91170ea26a60a714f05ce59a27a8c510ac197\n" }, { "commit": "879ecd17ab1e9645a9fff994e856fabeb68c8f96", "tree": "81f9d579049de0371cc2d7c8f3b0e49f499302e7", "parents": [ "9ea0739c99036ad74a1180d51a39d1c3b553b388", "ee4a2aee83257202725655e2915e92137180a580" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 24 22:45:36 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 24 22:45:36 2018 +0000" }, "message": "[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83\n\nChange-Id: Ieaa5386305a8d359b5b79d99925bd12696bbce2a\n" }, { "commit": "ee4a2aee83257202725655e2915e92137180a580", "tree": "53bb2d3538d7e9f4170862cacbef5c6acbf9097b", "parents": [ "3504302bb2780de95cde848f191dde7fedf7431c", "eff2a46342dbf8dc8a5e45426c50e3dd0f793b30" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 24 22:45:29 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 24 22:45:29 2018 +0000" }, "message": "[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342\n\nChange-Id: I2f97a9e176348ae81e9d72f8cb3c22e3f74c0a81\n" }, { "commit": "eff2a46342dbf8dc8a5e45426c50e3dd0f793b30", "tree": "51c164ad6c610289588c28ae04a5d3bc8c5225a9", "parents": [ "00751399025110fa9cf0498fbdfb470170db3032", "7d153c56c622f55a74277e5b1ebfd32dbb51eb99" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 24 22:45:22 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 24 22:45:22 2018 +0000" }, "message": "[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6\n\nChange-Id: Idba111169b057b88a7b47dde4b734ede2c651310\n" }, { "commit": "7d153c56c622f55a74277e5b1ebfd32dbb51eb99", "tree": "156086c0fc9b86b684a9946c44dda0e1eee11575", "parents": [ "1425bb41aa61eaf10c93c5f153da131ac9f86a74", "8da6786608e374c20ae584b1c404fd4894786e46" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 24 22:45:15 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Fri Aug 24 22:45:15 2018 +0000" }, "message": "[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608\n\nChange-Id: I2c9174d4b065aada8c4ba95e864b3628dd1f0975\n" }, { "commit": "8da6786608e374c20ae584b1c404fd4894786e46", "tree": "671143964fe98c6c2b5822c5c425c72c51933213", "parents": [ "bf441335ea5b02d15c1c9524508c7bb8acc0ed8a" ], "author": { "name": "akirilov", "email": "akirilov@google.com", "time": "Fri Aug 24 15:43:05 2018 -0700" }, "committer": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Fri Aug 24 22:45:13 2018 +0000" }, "message": "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions.\n\nBug: 111752150\nTest: Manual local test\nChange-Id: I0b48a20525f87fc6f5ab8d7e70aa7d11cd747f97\n" }, { "commit": "cc22fcc2959dd62572a8b5a84851134cea506014", "tree": "bc3f13ab37f4288b830ae5f08d6bb541e15038c1", "parents": [ "ffec86ff2370165e7a2cfbf39b5d79feb767310c", "dff5d48b7eb2b527e998a9f3ff794ccd9539b85d" ], "author": { "name": "Todd Kennedy", "email": "toddke@google.com", "time": "Fri Aug 17 12:47:28 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 12:47:28 2018 -0700" }, "message": "Merge \"RESTRICT AUTOMERGE Relax security exception for backport\" into oc-dev am: 5b78b0015e\nam: dff5d48b7e\n\nChange-Id: I4e419bcce7375da6b09c01c6a78e127de6dbf189\n" }, { "commit": "dff5d48b7eb2b527e998a9f3ff794ccd9539b85d", "tree": "f39f8cfece93741891a542f9b3834b31bb3dad71", "parents": [ "e88da3d679e13b4923d16fc3062a14138b9cf96c", "5b78b0015e0ce0d16358409cae60eedf5ff7212f" ], "author": { "name": "Todd Kennedy", "email": "toddke@google.com", "time": "Fri Aug 17 12:19:09 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 17 12:19:09 2018 -0700" }, "message": "Merge \"RESTRICT AUTOMERGE Relax security exception for backport\" into oc-dev\nam: 5b78b0015e\n\nChange-Id: I2da67334d41640ecac6f2b9b31c93d16ee48dc22\n" }, { "commit": "5b78b0015e0ce0d16358409cae60eedf5ff7212f", "tree": "5b481a7593e8c02733710ad3e4dc12dad606548e", "parents": [ "fc28b6b724325de5b7704a2ccf5713ebc321acb4", "a2405766db1ef38ed71ba4a84746bd8116e59661" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Aug 17 18:56:28 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 17 18:56:28 2018 +0000" }, "message": "Merge \"RESTRICT AUTOMERGE Relax security exception for backport\" into oc-dev" }, { "commit": "ffec86ff2370165e7a2cfbf39b5d79feb767310c", "tree": "c223fbecfac3d583eb952ef23f0143675cb5ce4b", "parents": [ "55ff3c76c5880f74eaa89166ab336ea0c4a06f96", "e88da3d679e13b4923d16fc3062a14138b9cf96c" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 14:01:02 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 15 14:01:02 2018 -0700" }, "message": "[automerger skipped] Merge changes from topic \"am-0f30ee3d-94a0-4dc3-bb14-762781265ad9\" into oc-dev am: fc28b6b724 -s ours\nam: e88da3d679 -s ours\n\nChange-Id: Ic3ad5eefc164ba31cd4f256b9ee39d8bc3aa1d5a\n" }, { "commit": "55ff3c76c5880f74eaa89166ab336ea0c4a06f96", "tree": "c223fbecfac3d583eb952ef23f0143675cb5ce4b", "parents": [ "358569004799130b61f89a639a772a934aad849b", "e82c4b82cc0d9551b6ccbe4926b97799054762be" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 13:48:07 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 15 13:48:07 2018 -0700" }, "message": "[automerger skipped] Merge changes from topic \"am-c709fe3e-1c07-4ecd-9998-2477e3445dd4\" into oc-dev am: d5e6e1e83e -s ours\nam: e82c4b82cc -s ours\n\nChange-Id: I1b7c3d8c456fa438233fa0884567b06f3b63eb4f\n" }, { "commit": "358569004799130b61f89a639a772a934aad849b", "tree": "c223fbecfac3d583eb952ef23f0143675cb5ce4b", "parents": [ "2cd112082b08a19c007d26069571867f99aa7569", "06829a62b11ea685a925f56775065e3e9a454b66" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 13:38:40 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 15 13:38:40 2018 -0700" }, "message": "[automerger skipped] Merge \"Fix crash during cursor moving on BiDi text\" into oc-dev am: e385255db4\nam: 06829a62b1 -s ours\n\nChange-Id: I9563f6fc8afa112e8a8455ffde9a221432cbcbf9\n" }, { "commit": "e88da3d679e13b4923d16fc3062a14138b9cf96c", "tree": "5d1b049248e9c447ef050c5c304cd3941c81d688", "parents": [ "e82c4b82cc0d9551b6ccbe4926b97799054762be", "fc28b6b724325de5b7704a2ccf5713ebc321acb4" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 13:04:26 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 15 13:04:26 2018 -0700" }, "message": "[automerger skipped] Merge changes from topic \"am-0f30ee3d-94a0-4dc3-bb14-762781265ad9\" into oc-dev\nam: fc28b6b724 -s ours\n\nChange-Id: I74179d805d746ccbb32546fb268cb52c8c9db514\n" }, { "commit": "e82c4b82cc0d9551b6ccbe4926b97799054762be", "tree": "5d1b049248e9c447ef050c5c304cd3941c81d688", "parents": [ "06829a62b11ea685a925f56775065e3e9a454b66", "d5e6e1e83e3a804301e1026d803b73769ad8ed5e" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 12:52:34 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 15 12:52:34 2018 -0700" }, "message": "[automerger skipped] Merge changes from topic \"am-c709fe3e-1c07-4ecd-9998-2477e3445dd4\" into oc-dev\nam: d5e6e1e83e -s ours\n\nChange-Id: Ie4fb9ca93c435f53cfe6db23b4902b094506b618\n" }, { "commit": "06829a62b11ea685a925f56775065e3e9a454b66", "tree": "5d1b049248e9c447ef050c5c304cd3941c81d688", "parents": [ "3f4c1ece822af7b8e3167ed607eeba2db469385f", "e385255db4a725628288d1adbfbb665e2f192a4c" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 12:43:55 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 15 12:43:55 2018 -0700" }, "message": "Merge \"Fix crash during cursor moving on BiDi text\" into oc-dev\nam: e385255db4\n\nChange-Id: Ib094039b1c515af77fcc3c051352de5cb15861cb\n" }, { "commit": "9ea0739c99036ad74a1180d51a39d1c3b553b388", "tree": "10fa48be70503e2fff384cba55f12d1cbcf6d2ce", "parents": [ "8f85f5ffd235325ac7a8a03b2adb9eba12c96351", "11ba74cce9e377a194b444df9d8c2f3a28c7fd40" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "message": "Merge changes from topic \"am-0f30ee3d-94a0-4dc3-bb14-762781265ad9\" into nyc-mr2-dev\n\n* changes:\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573 am: 7693ce7eaf\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea\n Fix crash during cursor moving on BiDi text\n" }, { "commit": "3504302bb2780de95cde848f191dde7fedf7431c", "tree": "d0ca5944ca6ed9984abfca3f2f671c30716b6a99", "parents": [ "a959ee227a708acbb59bcb197bd04358456a520a", "7693ce7eafca70cfb796563d7ae78f80909cde5d" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "message": "Merge changes from topic \"am-0f30ee3d-94a0-4dc3-bb14-762781265ad9\" into cw-f-dev\n\n* changes:\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea\n Fix crash during cursor moving on BiDi text\n" }, { "commit": "00751399025110fa9cf0498fbdfb470170db3032", "tree": "a69eff5d88e417d8f7693ac4dd36a101404f26c9", "parents": [ "99e3f649b43273c5a135416f036aa874f9a41685", "f7f008f573976670a86b9b68e1d89df9df921230" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "message": "Merge changes from topic \"am-0f30ee3d-94a0-4dc3-bb14-762781265ad9\" into nyc-mr1-dev\n\n* changes:\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea\n Fix crash during cursor moving on BiDi text\n" }, { "commit": "1425bb41aa61eaf10c93c5f153da131ac9f86a74", "tree": "f00dddc0a702ec20bb3579620a82599f2ed6eef3", "parents": [ "12baaa2bc3b082ab132bb6808fee6856f98feee3", "74ffd2bc556443e6f34b4947c0328b593a7c6aa5" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "message": "Merge changes from topic \"am-0f30ee3d-94a0-4dc3-bb14-762781265ad9\" into nyc-dr1-dev\n\n* changes:\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea\n Fix crash during cursor moving on BiDi text\n" }, { "commit": "bf441335ea5b02d15c1c9524508c7bb8acc0ed8a", "tree": "8a38135398b417b5c7a6c4f103874687461e770e", "parents": [ "25f2fa4cf7f1b882c921c12ac126f815eaa3da91", "65082f8f5b0a85164f283a96ded58745431ea0e5" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "message": "Merge changes from topic \"am-0f30ee3d-94a0-4dc3-bb14-762781265ad9\" into nyc-dev\n\n* changes:\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea\n Fix crash during cursor moving on BiDi text\n" }, { "commit": "fc28b6b724325de5b7704a2ccf5713ebc321acb4", "tree": "ad4fcf5e5df14a581594da13334cc3cbad71783e", "parents": [ "d5e6e1e83e3a804301e1026d803b73769ad8ed5e", "01ff91a07cc6844ae4a717ec2d96e74c5f736a76" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 15 19:23:35 2018 +0000" }, "message": "Merge changes from topic \"am-0f30ee3d-94a0-4dc3-bb14-762781265ad9\" into oc-dev\n\n* changes:\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573 am: 7693ce7eaf am: 11ba74cce9\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573 am: 7693ce7eaf\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2\n [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea\n Fix crash during cursor moving on BiDi text\n" }, { "commit": "d5e6e1e83e3a804301e1026d803b73769ad8ed5e", "tree": "ad4fcf5e5df14a581594da13334cc3cbad71783e", "parents": [ "e385255db4a725628288d1adbfbb665e2f192a4c", "dfec065bd504bdf9673ca2678b6183aa89017672" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 19:17:04 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 15 19:17:04 2018 +0000" }, "message": "Merge changes from topic \"am-c709fe3e-1c07-4ecd-9998-2477e3445dd4\" into oc-dev\n\n* changes:\n [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3 am: 99e3f649b4 am: a959ee227a am: 8f85f5ffd2\n [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3 am: 99e3f649b4 am: a959ee227a\n [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3 am: 99e3f649b4\n [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3\n [automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb\n Fix crash during cursor moving on BiDi text\n" }, { "commit": "25f2fa4cf7f1b882c921c12ac126f815eaa3da91", "tree": "8a38135398b417b5c7a6c4f103874687461e770e", "parents": [ "8aecc35a204f53cfab33aae0d55818f4df22cb2e", "82c84d5fbb692f5ed56175c55031e30566c18ee2" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 19:17:04 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 15 19:17:04 2018 +0000" }, "message": "Merge \"Fix crash during cursor moving on BiDi text\" into nyc-dev" }, { "commit": "e385255db4a725628288d1adbfbb665e2f192a4c", "tree": "ad4fcf5e5df14a581594da13334cc3cbad71783e", "parents": [ "9d85c1ff53a80c03cc05e644dd28a232ba052258", "f496a7cdc6ec1b04e0eb0cb19e4d382f2d823b8f" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 19:16:40 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 15 19:16:40 2018 +0000" }, "message": "Merge \"Fix crash during cursor moving on BiDi text\" into oc-dev" }, { "commit": "2cd112082b08a19c007d26069571867f99aa7569", "tree": "c223fbecfac3d583eb952ef23f0143675cb5ce4b", "parents": [ "f0d9a094d2d86133e17aca88621a956bf89aeb45", "d30c55e3ccf25668fcbccf29c94224fd1d2e67b6" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 19:16:21 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 15 19:16:21 2018 +0000" }, "message": "Merge \"Fix crash during cursor moving on BiDi text\" into oc-mr1-dev" }, { "commit": "dfec065bd504bdf9673ca2678b6183aa89017672", "tree": "ad4fcf5e5df14a581594da13334cc3cbad71783e", "parents": [ "9d85c1ff53a80c03cc05e644dd28a232ba052258", "8f85f5ffd235325ac7a8a03b2adb9eba12c96351" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 19:13:15 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 19:13:15 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3 am: 99e3f649b4 am: a959ee227a am: 8f85f5ffd2\n\nChange-Id: If854f61c2516a61ac36426c10eafd30bf638e919\n" }, { "commit": "8f85f5ffd235325ac7a8a03b2adb9eba12c96351", "tree": "10fa48be70503e2fff384cba55f12d1cbcf6d2ce", "parents": [ "cdc0a14f3e6a57f202cc03fd306f20cfa1c58fda", "a959ee227a708acbb59bcb197bd04358456a520a" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 19:13:10 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 19:13:10 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3 am: 99e3f649b4 am: a959ee227a\n\nChange-Id: I7cb6623befc84f76e783b8800aa18ce28a8cc2b7\n" }, { "commit": "a959ee227a708acbb59bcb197bd04358456a520a", "tree": "d0ca5944ca6ed9984abfca3f2f671c30716b6a99", "parents": [ "96e845cc4c85426f44cc9f995b376a816bbf2f6c", "99e3f649b43273c5a135416f036aa874f9a41685" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 19:13:04 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 19:13:04 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3 am: 99e3f649b4\n\nChange-Id: I16bff43cf755e443ed53f7a45469351c498f977f\n" }, { "commit": "99e3f649b43273c5a135416f036aa874f9a41685", "tree": "a69eff5d88e417d8f7693ac4dd36a101404f26c9", "parents": [ "7ae6e6566fb90ec486e7f31d5ccbcaf18acd3b69", "12baaa2bc3b082ab132bb6808fee6856f98feee3" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 19:12:59 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 19:12:59 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb am: 12baaa2bc3\n\nChange-Id: Iaf0aded3004f33fdb52dd0c19779329991b24746\n" }, { "commit": "12baaa2bc3b082ab132bb6808fee6856f98feee3", "tree": "f00dddc0a702ec20bb3579620a82599f2ed6eef3", "parents": [ "fce27e8502ad334ca61d0dca73af391a09e7638a", "82c84d5fbb692f5ed56175c55031e30566c18ee2" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 19:12:52 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 19:12:52 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 82c84d5fbb\n\nChange-Id: I221d974ba9402c088235d5bdb3c94e91cf4167ba\n" }, { "commit": "82c84d5fbb692f5ed56175c55031e30566c18ee2", "tree": "f611fb51344f8c5c96c40202f2fa6ccbc5534023", "parents": [ "8e95967f092b4ffa593861452e55621b4e528acf" ], "author": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Thu Jul 19 16:22:02 2018 -0700" }, "committer": { "name": "Mike Logan", "email": "mikelogan@google.com", "time": "Wed Aug 15 19:12:50 2018 +0000" }, "message": "Fix crash during cursor moving on BiDi text\n\nThe crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0\nThe root cause of the crashing is requesting out-of-line access for the\nhorizontal width. This invalid access is silently ignored by\nTextLine#measure() method but new implementation end up with out of\nbounds access.\n\nTo makes behavior as old implementation, calling getHorizontal instead\nof accessing measured result array.\n\nBug: 78464361, 111580019\nTest: Manually done\nChange-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8\n(cherry picked from commit 960647d582911ae7ab8b9491097898e6c313aaf1)\nMerged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8\n" }, { "commit": "d30c55e3ccf25668fcbccf29c94224fd1d2e67b6", "tree": "faa0e8c413795572d6894ffb78ba1d40a9b7987b", "parents": [ "3375c14aefe5479d452dc0fcaffa7e86460b230a" ], "author": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Thu Jul 19 16:22:02 2018 -0700" }, "committer": { "name": "Mike Logan", "email": "mikelogan@google.com", "time": "Wed Aug 15 19:12:43 2018 +0000" }, "message": "Fix crash during cursor moving on BiDi text\n\nThe crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0\nThe root cause of the crashing is requesting out-of-line access for the\nhorizontal width. This invalid access is silently ignored by\nTextLine#measure() method but new implementation end up with out of\nbounds access.\n\nTo makes behavior as old implementation, calling getHorizontal instead\nof accessing measured result array.\n\nBug: 78464361, 111580019\nTest: Manually done\nChange-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8\n(cherry picked from commit 960647d582911ae7ab8b9491097898e6c313aaf1)\nMerged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8\n" }, { "commit": "f496a7cdc6ec1b04e0eb0cb19e4d382f2d823b8f", "tree": "bd0470badc7b2518c2a4aa7676d6a41d8b089e65", "parents": [ "f0095ec4d67669bc4b0a68df8ef13deab4d94470" ], "author": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Thu Jul 19 16:22:02 2018 -0700" }, "committer": { "name": "Mike Logan", "email": "mikelogan@google.com", "time": "Wed Aug 15 19:12:27 2018 +0000" }, "message": "Fix crash during cursor moving on BiDi text\n\nThe crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0\nThe root cause of the crashing is requesting out-of-line access for the\nhorizontal width. This invalid access is silently ignored by\nTextLine#measure() method but new implementation end up with out of\nbounds access.\n\nTo makes behavior as old implementation, calling getHorizontal instead\nof accessing measured result array.\n\nBug: 78464361, 111580019\nTest: Manually done\nChange-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8\n(cherry picked from commit 960647d582911ae7ab8b9491097898e6c313aaf1)\nMerged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8\n" }, { "commit": "01ff91a07cc6844ae4a717ec2d96e74c5f736a76", "tree": "f839974d5849e132f4473db67e11d108b0643126", "parents": [ "9d85c1ff53a80c03cc05e644dd28a232ba052258", "11ba74cce9e377a194b444df9d8c2f3a28c7fd40" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:29:36 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:29:36 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573 am: 7693ce7eaf am: 11ba74cce9\n\nChange-Id: Ia5fad0a4e89e6ff44c546ab71f37f657a3313f0d\n" }, { "commit": "11ba74cce9e377a194b444df9d8c2f3a28c7fd40", "tree": "ebbe8c9f675f209077aeaa670fc92e09ea265c96", "parents": [ "cdc0a14f3e6a57f202cc03fd306f20cfa1c58fda", "7693ce7eafca70cfb796563d7ae78f80909cde5d" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:29:30 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:29:30 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573 am: 7693ce7eaf\n\nChange-Id: Ic311029be8ab99f4aaae526d980da0f2436c5459\n" }, { "commit": "7693ce7eafca70cfb796563d7ae78f80909cde5d", "tree": "40ffea47dc7b8476736f2442d8e5bbea97d65e44", "parents": [ "96e845cc4c85426f44cc9f995b376a816bbf2f6c", "f7f008f573976670a86b9b68e1d89df9df921230" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:29:23 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:29:23 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573\n\nChange-Id: I4122a5c548c4b3395bb546c459c34f10b319ad29\n" }, { "commit": "f7f008f573976670a86b9b68e1d89df9df921230", "tree": "bc36b62c9ce8bd970a396da1042099f59b1e76fa", "parents": [ "7ae6e6566fb90ec486e7f31d5ccbcaf18acd3b69", "74ffd2bc556443e6f34b4947c0328b593a7c6aa5" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:29:16 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:29:16 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55\n\nChange-Id: I680848db0e845617323ecca36c380fdf890789d9\n" }, { "commit": "74ffd2bc556443e6f34b4947c0328b593a7c6aa5", "tree": "03b229086bcb72e5a41db0187d3687d1ac88c15b", "parents": [ "fce27e8502ad334ca61d0dca73af391a09e7638a", "65082f8f5b0a85164f283a96ded58745431ea0e5" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:29:09 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:29:09 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b\n\nChange-Id: I27b2220f568a37ff16b0dfc3376d7e46cb3659c9\n" }, { "commit": "65082f8f5b0a85164f283a96ded58745431ea0e5", "tree": "c920e7871b55b1bc98698f85332ec0a8646855ca", "parents": [ "8aecc35a204f53cfab33aae0d55818f4df22cb2e", "04c7154fd95d5599cee3b4de3d911323ae4a6dff" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:28:52 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:28:52 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9\n\nChange-Id: Ic801a54fa6cb048ddf911c7b315849ab40bd7a52\n" }, { "commit": "04c7154fd95d5599cee3b4de3d911323ae4a6dff", "tree": "b6598653e7fabc71603bd44cf31cf6984ac44a14", "parents": [ "b27b3c7fce2905861e704c66c1e8dbe8c07492f6", "723f13d01f146123c74994e38bc6ec69893ec062" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:28:41 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:28:41 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f\n\nChange-Id: If1607fb19bd806cb6d0f9b9010032e95df6549a8\n" }, { "commit": "723f13d01f146123c74994e38bc6ec69893ec062", "tree": "d0b96b053a8bf4bf79cf31ce29f16ca8d4492782", "parents": [ "a31be05c5b5662bc710292ffd6af219dd7185fb5", "b7a2d47ec29c47bf53414f5e049d8154910bf626" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:26:19 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:26:19 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2\n\nChange-Id: I6995aab201805b64e81022db295356ef8abda30c\n" }, { "commit": "b7a2d47ec29c47bf53414f5e049d8154910bf626", "tree": "ae975ba2beeff73a958a092dbe0e10910c50bee3", "parents": [ "70e4dec56bbcf618cc300a85af99630075ca98ff", "95218ce7ea43c7633ca8c9f6e2aca9baaba4c3e5" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:26:10 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Wed Aug 15 00:26:10 2018 +0000" }, "message": "[automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea\n\nChange-Id: Id97c3f508a0dcd82978b06891b3a979921d4be3a\n" }, { "commit": "95218ce7ea43c7633ca8c9f6e2aca9baaba4c3e5", "tree": "f1d26ce29af677409d0efc2678e520b3f46f92a4", "parents": [ "448b5656625d27da0003e5eef39b5801b2eebcb6" ], "author": { "name": "Seigo Nonaka", "email": "nona@google.com", "time": "Thu Jul 19 16:22:02 2018 -0700" }, "committer": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Wed Aug 15 00:26:02 2018 +0000" }, "message": "Fix crash during cursor moving on BiDi text\n\nThe crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0\nThe root cause of the crashing is requesting out-of-line access for the\nhorizontal width. This invalid access is silently ignored by\nTextLine#measure() method but new implementation end up with out of\nbounds access.\n\nTo makes behavior as old implementation, calling getHorizontal instead\nof accessing measured result array.\n\nBug: 111580019\nTest: Manually done\nChange-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8\nMerged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0\n" }, { "commit": "f0d9a094d2d86133e17aca88621a956bf89aeb45", "tree": "2b9b199ae99d13c9903e4d6728ce2e22a26c9171", "parents": [ "3b8808869aeb6451439b2c103ebc7c0434793ceb", "3f4c1ece822af7b8e3167ed607eeba2db469385f" ], "author": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Tue Aug 14 13:46:06 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 14 13:46:06 2018 -0700" }, "message": "Merge changes from topic \"am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8\" into oc-dev am: 9d85c1ff53\nam: 3f4c1ece82\n\nChange-Id: I0df7f7f048ebdc8fbfc608ec8e532fbf9fa3a866\n" }, { "commit": "3b8808869aeb6451439b2c103ebc7c0434793ceb", "tree": "2b9b199ae99d13c9903e4d6728ce2e22a26c9171", "parents": [ "3375c14aefe5479d452dc0fcaffa7e86460b230a", "02d1a54dcfa85d3d9d7411142424939399b9b5a0" ], "author": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Tue Aug 14 13:36:38 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 14 13:36:38 2018 -0700" }, "message": "Merge \"RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.\" into oc-dev am: 5315bbfbc7\nam: 02d1a54dcf\n\nChange-Id: Id2ce7a146a5fc65e8c9c24560376a387cef76ca0\n" }, { "commit": "3f4c1ece822af7b8e3167ed607eeba2db469385f", "tree": "2bb412c8d18dc418ebe1a60f39776036dd06fee3", "parents": [ "02d1a54dcfa85d3d9d7411142424939399b9b5a0", "9d85c1ff53a80c03cc05e644dd28a232ba052258" ], "author": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Tue Aug 14 13:16:40 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 14 13:16:40 2018 -0700" }, "message": "Merge changes from topic \"am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8\" into oc-dev\nam: 9d85c1ff53\n\nChange-Id: I96184594285add35eacbac8e61da3120e4ce67a1\n" }, { "commit": "02d1a54dcfa85d3d9d7411142424939399b9b5a0", "tree": "2bb412c8d18dc418ebe1a60f39776036dd06fee3", "parents": [ "5e8e47d4f8829cd7cb2e58bd1b6cb96e7c7cd1f1", "5315bbfbc7c3a922527c7f59fdb7a7671b505ab0" ], "author": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Tue Aug 14 12:59:29 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Aug 14 12:59:29 2018 -0700" }, "message": "Merge \"RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.\" into oc-dev\nam: 5315bbfbc7\n\nChange-Id: Ibde8da5add8ee9e51c03b1ebb68b80313a7a5bb6\n" }, { "commit": "8aecc35a204f53cfab33aae0d55818f4df22cb2e", "tree": "c920e7871b55b1bc98698f85332ec0a8646855ca", "parents": [ "8e95967f092b4ffa593861452e55621b4e528acf", "fa69d725eb99b8c20a15135304bf5be4ea811573" ], "author": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "message": "Merge \"RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.\" into nyc-dev" }, { "commit": "9d85c1ff53a80c03cc05e644dd28a232ba052258", "tree": "f839974d5849e132f4473db67e11d108b0643126", "parents": [ "5315bbfbc7c3a922527c7f59fdb7a7671b505ab0", "ecde0c2a39f6f20bb6753ab2c6cac313ee46a541" ], "author": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "message": "Merge changes from topic \"am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8\" into oc-dev\n\n* changes:\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7 am: a491c04815 am: 9310c5bdd3 skipped: c565a7f7e2\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7 am: a491c04815 am: 9310c5bdd3\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7 am: a491c04815\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb\n RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.\n" }, { "commit": "cdc0a14f3e6a57f202cc03fd306f20cfa1c58fda", "tree": "ebbe8c9f675f209077aeaa670fc92e09ea265c96", "parents": [ "a2ad2596b7f95ac1782a8e85fe1278083326fa48", "c565a7f7e2ed714b375d9810dd792dda81adcc7e" ], "author": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "message": "Merge changes from topic \"am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8\" into nyc-mr2-dev\n\n* changes:\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7 am: a491c04815 am: 9310c5bdd3\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7 am: a491c04815\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb\n RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.\n" }, { "commit": "96e845cc4c85426f44cc9f995b376a816bbf2f6c", "tree": "40ffea47dc7b8476736f2442d8e5bbea97d65e44", "parents": [ "b2e2b1386fe5f1ae6cc3189ae4ea2d04f4bec583", "9310c5bdd366b1c96bbdd94018e8a3196f8560d0" ], "author": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "message": "Merge changes from topic \"am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8\" into cw-f-dev\n\n* changes:\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7 am: a491c04815\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb\n RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.\n" }, { "commit": "7ae6e6566fb90ec486e7f31d5ccbcaf18acd3b69", "tree": "bc36b62c9ce8bd970a396da1042099f59b1e76fa", "parents": [ "424304f893f0c803563194b092b384dc17c23f96", "a491c048150732e893ac231d1a5ac10db0230ba8" ], "author": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "message": "Merge changes from topic \"am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8\" into nyc-mr1-dev\n\n* changes:\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb am: 7d252f5ed7\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb\n RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.\n" }, { "commit": "fce27e8502ad334ca61d0dca73af391a09e7638a", "tree": "03b229086bcb72e5a41db0187d3687d1ac88c15b", "parents": [ "c09bb997e8d5d48ee33bcb7949bf603ff9b455a1", "7d252f5ed7be8608721dee0a4b220f8d55cea299" ], "author": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 14 19:40:27 2018 +0000" }, "message": "Merge changes from topic \"am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8\" into nyc-dr1-dev\n\n* changes:\n [automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am: fa69d725eb\n RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.\n" }, { "commit": "5315bbfbc7c3a922527c7f59fdb7a7671b505ab0", "tree": "f839974d5849e132f4473db67e11d108b0643126", "parents": [ "f0095ec4d67669bc4b0a68df8ef13deab4d94470", "821076440434443af4257c5ba0b7b1f037735041" ], "author": { "name": "Atanas Kirilov", "email": "akirilov@google.com", "time": "Tue Aug 14 19:40:14 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 14 19:40:14 2018 +0000" }, "message": "Merge \"RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.\" into oc-dev" }, { "commit": "3375c14aefe5479d452dc0fcaffa7e86460b230a", "tree": "e39238f0d7c31f450680838e504cefc8a19d285c", "parents": [ "d270842f22e22a47c0311690ca13c300b525a7f2", "5e8e47d4f8829cd7cb2e58bd1b6cb96e7c7cd1f1" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Aug 10 12:28:13 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:28:13 2018 -0700" }, "message": "Merge changes from topic \"back111085900\" into oc-dev am: f0095ec4d6\nam: 5e8e47d4f8\n\nChange-Id: I251eeddbbd73f0747920d757d6a210d0d5b772f5\n" }, { "commit": "d270842f22e22a47c0311690ca13c300b525a7f2", "tree": "c69e75448bd17a679dfd35dd76bbc871d83e91ee", "parents": [ "2adafa92bcbec4f9f2ef12051c755f9abbc503c7", "628667ac86032f4c5c6538bb868dd96d7c8e55ee" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 12:23:42 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:23:42 2018 -0700" }, "message": "DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 5a55a72fcd\nam: 628667ac86\n\nChange-Id: I8f8645a99e8b3bd07cd82722b8af888d46955030\n" }, { "commit": "2adafa92bcbec4f9f2ef12051c755f9abbc503c7", "tree": "6aebf6634786c73cb602f5540217e64795513974", "parents": [ "798655e2e114230ffa52e6017537cc026f29fc34", "efe1afbf93b328e96176b3becc888e457f95c0ed" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 12:20:08 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:20:08 2018 -0700" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893 am: b2e2b1386f skipped: a2ad2596b7 am: 4ccfb1d0aa\nam: efe1afbf93\n\nChange-Id: I7ebe940777eba8ee575a0f970b462e447f241d53\n" }, { "commit": "798655e2e114230ffa52e6017537cc026f29fc34", "tree": "6aebf6634786c73cb602f5540217e64795513974", "parents": [ "130a2041e7d36ff2427b7d1754a5a25ae0a0ae01", "b2ed78a19765263a0553fc50a5f5cd0ce3c9382a" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 12:12:07 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 12:12:07 2018 -0700" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209 am: ca5fd693bc skipped: 19d2af61df am: f5c1a7ca27\nam: b2ed78a197\n\nChange-Id: I695962bed5fdd932b434244a5c50d33dce34f08b\n" }, { "commit": "5e8e47d4f8829cd7cb2e58bd1b6cb96e7c7cd1f1", "tree": "1711674c75f4bd6c652947eabf0a342cb5588cbe", "parents": [ "628667ac86032f4c5c6538bb868dd96d7c8e55ee", "f0095ec4d67669bc4b0a68df8ef13deab4d94470" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Aug 10 11:12:36 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 11:12:36 2018 -0700" }, "message": "Merge changes from topic \"back111085900\" into oc-dev\nam: f0095ec4d6\n\nChange-Id: Ie563f7c17a201dadfe8a6696d2cf99aebc07b855\n" }, { "commit": "628667ac86032f4c5c6538bb868dd96d7c8e55ee", "tree": "46772ad20ee966f45f72b9e30ab5b8230f08cad4", "parents": [ "efe1afbf93b328e96176b3becc888e457f95c0ed", "5a55a72fcd18fb676eb4c114e62048068f71c01a" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 11:05:51 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 11:05:51 2018 -0700" }, "message": "DO NOT MERGE. Execute \"strict\" queries with extra parentheses.\nam: 5a55a72fcd\n\nChange-Id: I4be4620726e30ca4131320bde074a2e572c51a42\n" }, { "commit": "efe1afbf93b328e96176b3becc888e457f95c0ed", "tree": "b16a5166e65241730eb58f3b4eab4228c5511c91", "parents": [ "b2ed78a19765263a0553fc50a5f5cd0ce3c9382a", "4ccfb1d0aa025163b404802c4731390846349be9" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 10:58:44 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 10:58:44 2018 -0700" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893 am: b2e2b1386f skipped: a2ad2596b7\nam: 4ccfb1d0aa\n\nChange-Id: Iffccf38fd5e090757a2610d7b2cea6f9eacfb51b\n" }, { "commit": "b2ed78a19765263a0553fc50a5f5cd0ce3c9382a", "tree": "b16a5166e65241730eb58f3b4eab4228c5511c91", "parents": [ "1e4d88926f6ec3e9fb038afda888f709cd9bc845", "f5c1a7ca2778dbae675404ccc1e8a56b41d246ef" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 10 10:50:44 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Aug 10 10:50:44 2018 -0700" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209 am: ca5fd693bc skipped: 19d2af61df\nam: f5c1a7ca27\n\nChange-Id: I931e17dba1218ea342f9ec0f17a8a8432e77fc20\n" }, { "commit": "f0095ec4d67669bc4b0a68df8ef13deab4d94470", "tree": "40dc1def99521358bda932d2b61c485f8196eff5", "parents": [ "4ccfb1d0aa025163b404802c4731390846349be9", "09d49531334ce6bc4ac45de1d3d0edb1495c0566" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Fri Aug 10 17:26:54 2018 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 10 17:26:54 2018 +0000" }, "message": "Merge changes from topic \"back111085900\" into oc-dev\n\n* changes:\n DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.\n DO NOT MERGE. Execute \"strict\" queries with extra parentheses.\n" }, { "commit": "4ccfb1d0aa025163b404802c4731390846349be9", "tree": "9309ca9463eb4e7e8b6c313e34655b68c7d13d33", "parents": [ "f5c1a7ca2778dbae675404ccc1e8a56b41d246ef", "a2ad2596b7f95ac1782a8e85fe1278083326fa48" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:16:05 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:16:05 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893 am: b2e2b1386f skipped: a2ad2596b7\n\nChange-Id: I18dbb198314da3b3722e5b0dfbd9f1dd1e203d4a\n" }, { "commit": "a2ad2596b7f95ac1782a8e85fe1278083326fa48", "tree": "11be29ed820ca56f0ba64348f4adca26cf5e7681", "parents": [ "19d2af61df39f568b37c0e976d5ea3322a70bc9a", "b2e2b1386fe5f1ae6cc3189ae4ea2d04f4bec583" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:16:00 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:16:00 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893 am: b2e2b1386f\n\nChange-Id: Icdb977d8cb260d5210d103f306de550b3f8fed96\n" }, { "commit": "b2e2b1386fe5f1ae6cc3189ae4ea2d04f4bec583", "tree": "62f202408135941f1babfbcc1741660af1c93c38", "parents": [ "ca5fd693bc7eef0488af259a1fe4f2a60870c0c3", "424304f893f0c803563194b092b384dc17c23f96" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:55 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:55 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8 am: 424304f893\n\nChange-Id: I4c0f715b12df5e7ffb4f3a1b7cf9ae5da4be22ca\n" }, { "commit": "424304f893f0c803563194b092b384dc17c23f96", "tree": "3a2f1af1772db80e868c9e399d464998e4ef6a6a", "parents": [ "97d0d2c209d528d27083d880fa8ee2cdedc4fbd2", "c09bb997e8d5d48ee33bcb7949bf603ff9b455a1" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:51 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:51 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09 am: c09bb997e8\n\nChange-Id: I544bf2c6b5d0177aa70a6fb7bd4225d4d04881fd\n" }, { "commit": "c09bb997e8d5d48ee33bcb7949bf603ff9b455a1", "tree": "a11dc7ca8647c4afa051aa9b0f0498299ede6181", "parents": [ "8ecd22c0a4d790baeee6ca3d575aff8f29f2357b", "8e95967f092b4ffa593861452e55621b4e528acf" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:45 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:45 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am: 8e95967f09\n\nChange-Id: I6cdb5a5dd5531ad53ef02174ff5063788d11029d\n" }, { "commit": "f5c1a7ca2778dbae675404ccc1e8a56b41d246ef", "tree": "9309ca9463eb4e7e8b6c313e34655b68c7d13d33", "parents": [ "05519b7e3d0f3d16ddfe6ee3892c8468a2c10c62", "19d2af61df39f568b37c0e976d5ea3322a70bc9a" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:44 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:44 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209 am: ca5fd693bc skipped: 19d2af61df\n\nChange-Id: I66ddfbffbec736061780c86c9c9e542fe2a200ba\n" }, { "commit": "19d2af61df39f568b37c0e976d5ea3322a70bc9a", "tree": "ae7f75cbe1be7cbc5910c2adbdba39d8087fa0ea", "parents": [ "cfc6d8607e2b3f4b7c91eba5e20e5c6cc16de91f", "ca5fd693bc7eef0488af259a1fe4f2a60870c0c3" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:39 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:39 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209 am: ca5fd693bc\n\nChange-Id: Iccacb48d382a3fd8012dff81c3d8482afe0e5f14\n" }, { "commit": "ca5fd693bc7eef0488af259a1fe4f2a60870c0c3", "tree": "ba430602de9f7e4b01c6c7dd05eaa48f32cfab03", "parents": [ "23162a8897fe2cefa0e090ba7785adc75cc10c67", "97d0d2c209d528d27083d880fa8ee2cdedc4fbd2" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:33 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:33 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4 am: 97d0d2c209\n\nChange-Id: I92820ffe7b45077bc4beaf97144a7b7eb3117af0\n" }, { "commit": "97d0d2c209d528d27083d880fa8ee2cdedc4fbd2", "tree": "ddc5c4df03406d8c70953751ddddec0440704fc3", "parents": [ "1bce1217ca17267c54e0960c203a9336d0e697e2", "8ecd22c0a4d790baeee6ca3d575aff8f29f2357b" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:28 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:28 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a am: 8ecd22c0a4\n\nChange-Id: Ia9f489c55def0f592383ac2a10f5bd0b34c2663d\n" }, { "commit": "8ecd22c0a4d790baeee6ca3d575aff8f29f2357b", "tree": "9af48301eefbaaf3283c6b8714c71acf75333b1c", "parents": [ "00b57fc9b76819db3a2ca365a6c6e1ff8e114636", "286fd5652a9804bfd185980dc07ad239e1169929" ], "author": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:19 2018 +0000" }, "committer": { "name": "Android Build Merger (Role)", "email": "noreply-android-build-merger@google.com", "time": "Thu Aug 09 20:15:19 2018 +0000" }, "message": "[automerger] DO NOT MERGE. Execute \"strict\" queries with extra parentheses. am: 286fd5652a\n\nChange-Id: Ia877305c642c3b7741941d2e438fe77f1d1550f3\n" }, { "commit": "130a2041e7d36ff2427b7d1754a5a25ae0a0ae01", "tree": "6aebf6634786c73cb602f5540217e64795513974", "parents": [ "b9504e591a668b6151a33c04cea6d0421c20d5b8", "1e4d88926f6ec3e9fb038afda888f709cd9bc845" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Aug 08 17:53:03 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 08 17:53:03 2018 -0700" }, "message": "DO NOT MERGE. Persistable Uri grants still require permissions. am: 05519b7e3d\nam: 1e4d88926f\n\nChange-Id: I267a65ad3c2e73b697f832059567f4f2c2438792\n" }, { "commit": "1e4d88926f6ec3e9fb038afda888f709cd9bc845", "tree": "b16a5166e65241730eb58f3b4eab4228c5511c91", "parents": [ "c93b474752483e7e99e63709f8511ca76c235680", "05519b7e3d0f3d16ddfe6ee3892c8468a2c10c62" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Aug 08 17:23:00 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Aug 08 17:23:00 2018 -0700" }, "message": "DO NOT MERGE. Persistable Uri grants still require permissions.\nam: 05519b7e3d\n\nChange-Id: I6d42f089fec6c268b35885d3169644853ab734c5\n" }, { "commit": "05519b7e3d0f3d16ddfe6ee3892c8468a2c10c62", "tree": "9309ca9463eb4e7e8b6c313e34655b68c7d13d33", "parents": [ "515700b4feb35ac615c8ca38165f629a67c4d99f" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue Aug 07 15:02:17 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Tue Aug 07 22:25:13 2018 +0000" }, "message": "DO NOT MERGE. Persistable Uri grants still require permissions.\n\nWhen FLAG_GRANT_PERSISTABLE_URI_PERMISSION is requested, we still\nneed to check permissions between the source and target packages,\ninstead of shortcutting past them.\n\nThe spirit of the original change is remains intact: if the caller\nrequested FLAG_GRANT_PERSISTABLE_URI_PERMISSION, then we avoid\nreturning \"-1\", which would prevent the grant data structure from\nbeing allocated.\n\nBug: 111934948\nTest: atest android.appsecurity.cts.AppSecurityTests\nChange-Id: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030\nMerged-In: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030\n" }, { "commit": "09d49531334ce6bc4ac45de1d3d0edb1495c0566", "tree": "29392ed3305ab843440b5a8b3d5d861e06c93e9b", "parents": [ "5a55a72fcd18fb676eb4c114e62048068f71c01a" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Jul 25 14:52:14 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 03 13:43:22 2018 -0600" }, "message": "DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.\n\nDevelopers often accept selection clauses from untrusted code, and\nSQLiteQueryBuilder already supports a \"strict\" mode to help catch\nSQL injection attacks. This change extends the builder to support\nupdate() and delete() calls, so that we can help secure those\nselection clauses too.\n\nBug: 111085900\nTest: atest packages/providers/DownloadProvider/tests/\nTest: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java\nTest: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java\nChange-Id: Ib4fc8400f184755ee7e971ab5f2095186341730c\nMerged-In: Ib4fc8400f184755ee7e971ab5f2095186341730c\n" }, { "commit": "5a55a72fcd18fb676eb4c114e62048068f71c01a", "tree": "081d88076aaf173759279cfc187bd60f4b982c04", "parents": [ "515700b4feb35ac615c8ca38165f629a67c4d99f" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Jul 25 14:01:59 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 03 13:43:16 2018 -0600" }, "message": "DO NOT MERGE. Execute \"strict\" queries with extra parentheses.\n\nSQLiteQueryBuilder has a setStrict() mode which can be used to\ndetect SQL attacks from untrusted sources, which it does by running\neach query twice: once with an extra set of parentheses, and if that\nsucceeds, it runs the original query verbatim.\n\nThis sadly doesn\u0027t catch inputs of the type \"1\u003d1) OR (1\u003d1\", which\ncreates valid statements for both tests above, but the final executed\nquery ends up leaking data due to SQLite operator precedence.\n\nInstead, we need to continue compiling both variants, but we need\nto execute the query with the additional parentheses to ensure\ndata won\u0027t be leaked.\n\nTest: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java\nBug: 111085900\nChange-Id: I6e8746fa48f9de13adae37d2990de11c9c585381\nMerged-In: I6e8746fa48f9de13adae37d2990de11c9c585381\n" }, { "commit": "8e95967f092b4ffa593861452e55621b4e528acf", "tree": "e84142caef234584e829867241c7d0878c3850cd", "parents": [ "286fd5652a9804bfd185980dc07ad239e1169929" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Jul 25 14:52:14 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 03 13:42:35 2018 -0600" }, "message": "DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.\n\nDevelopers often accept selection clauses from untrusted code, and\nSQLiteQueryBuilder already supports a \"strict\" mode to help catch\nSQL injection attacks. This change extends the builder to support\nupdate() and delete() calls, so that we can help secure those\nselection clauses too.\n\nBug: 111085900\nTest: atest packages/providers/DownloadProvider/tests/\nTest: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java\nTest: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java\nChange-Id: Ib4fc8400f184755ee7e971ab5f2095186341730c\nMerged-In: Ib4fc8400f184755ee7e971ab5f2095186341730c\n" }, { "commit": "286fd5652a9804bfd185980dc07ad239e1169929", "tree": "6b97158a00a964cbfaa1667a80fc08f16114199a", "parents": [ "b794b4cb9e5c541ef6142f689bcbe70aa56829f5" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Jul 25 14:01:59 2018 -0600" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Aug 03 13:38:31 2018 -0600" }, "message": "DO NOT MERGE. Execute \"strict\" queries with extra parentheses.\n\nSQLiteQueryBuilder has a setStrict() mode which can be used to\ndetect SQL attacks from untrusted sources, which it does by running\neach query twice: once with an extra set of parentheses, and if that\nsucceeds, it runs the original query verbatim.\n\nThis sadly doesn\u0027t catch inputs of the type \"1\u003d1) OR (1\u003d1\", which\ncreates valid statements for both tests above, but the final executed\nquery ends up leaking data due to SQLite operator precedence.\n\nInstead, we need to continue compiling both variants, but we need\nto execute the query with the additional parentheses to ensure\ndata won\u0027t be leaked.\n\nTest: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java\nBug: 111085900\nChange-Id: I6e8746fa48f9de13adae37d2990de11c9c585381\nMerged-In: I6e8746fa48f9de13adae37d2990de11c9c585381\n" }, { "commit": "b9504e591a668b6151a33c04cea6d0421c20d5b8", "tree": "81be9b132b330d655618477fd2c6dcec762e8c58", "parents": [ "ff99070f7858d1c45d1f6822c936efe7ad875e73", "c93b474752483e7e99e63709f8511ca76c235680" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 23:04:31 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 23:04:31 2018 -0700" }, "message": "Merge changes from topic \"am-c65d7988-0ca0-4757-9d9c-21f4575eec01\" into oc-dev am: 515700b4fe\nam: c93b474752\n\nChange-Id: I94c7b1d7e9bda726390fc5ceba62f8286a06bc42\n" }, { "commit": "ff99070f7858d1c45d1f6822c936efe7ad875e73", "tree": "81be9b132b330d655618477fd2c6dcec762e8c58", "parents": [ "ab2d9d3e3753886c4ab2157ebfbba655038e89c5", "27c3ba01ff9f08abc56beca2b86d5322c14bfc04" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:58:06 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:58:06 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb am: 976bb372c3 -s ours\nam: 27c3ba01ff -s ours\n\nChange-Id: Id3d12a61dbf1a9e7eeabf1c12c39b8aa43ffe52b\n" }, { "commit": "ab2d9d3e3753886c4ab2157ebfbba655038e89c5", "tree": "81be9b132b330d655618477fd2c6dcec762e8c58", "parents": [ "3b822cd07776d06b3166541837fa109e630431bb", "0834c94a931a9ede373ce822b3cebf02f029adfb" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:46:54 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:46:54 2018 -0700" }, "message": "Merge changes from topic \"am-1155d171-2145-4903-8420-80ecfd6c6b08\" into oc-dev am: d0025407df\nam: 0834c94a93\n\nChange-Id: I82eb8a2dfab9d3ce1d7b8de91950d9c2069da2db\n" }, { "commit": "c93b474752483e7e99e63709f8511ca76c235680", "tree": "390d01b43e3cc453bee765893ecb41807ac4d77c", "parents": [ "27c3ba01ff9f08abc56beca2b86d5322c14bfc04", "515700b4feb35ac615c8ca38165f629a67c4d99f" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:43:33 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:43:33 2018 -0700" }, "message": "Merge changes from topic \"am-c65d7988-0ca0-4757-9d9c-21f4575eec01\" into oc-dev\nam: 515700b4fe\n\nChange-Id: I0f58a9fe2bb437e8caf854b4ca8f5c4bc0f10c7d\n" }, { "commit": "27c3ba01ff9f08abc56beca2b86d5322c14bfc04", "tree": "390d01b43e3cc453bee765893ecb41807ac4d77c", "parents": [ "0834c94a931a9ede373ce822b3cebf02f029adfb", "976bb372c3b70d37f5336c32faeca09df524f5c2" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:41:40 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:41:40 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb\nam: 976bb372c3 -s ours\n\nChange-Id: I971275a90e048fec4861d2e866ec53c5d1b0a356\n" }, { "commit": "3b822cd07776d06b3166541837fa109e630431bb", "tree": "81be9b132b330d655618477fd2c6dcec762e8c58", "parents": [ "acdedf312261339dee722d9c2a984703e163bf8e", "786ae0d32260c0c42c13b4cc3cf07ef9ccc92494" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:40:28 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:40:28 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: f9a5e160d0 skipped: eff2a7b637 am: 70ebabc63d -s ours\nam: 786ae0d322 -s ours\n\nChange-Id: I1a741c23da3317c1b711a1a58cbf23bc4e97837e\n" }, { "commit": "acdedf312261339dee722d9c2a984703e163bf8e", "tree": "81be9b132b330d655618477fd2c6dcec762e8c58", "parents": [ "64cb4be88784d5f48da7092a8772c01e82a2b43e", "ffe456e49c1ecd4a2220b8c6cd96610386a6a7c7" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:19:49 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:19:49 2018 -0700" }, "message": "[automerger skipped] Import translations. DO NOT MERGE skipped: 4c781e19f5 skipped: b3e44fae1f am: 843fb76d1f -s ours\nam: ffe456e49c -s ours\n\nChange-Id: Ifc2aceed944b28d1a9d923f01eb92ab374d67d6b\n" }, { "commit": "0834c94a931a9ede373ce822b3cebf02f029adfb", "tree": "390d01b43e3cc453bee765893ecb41807ac4d77c", "parents": [ "786ae0d32260c0c42c13b4cc3cf07ef9ccc92494", "d0025407dfb8b601f154c433459abd199f4191ff" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sun Jul 29 22:18:03 2018 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Jul 29 22:18:03 2018 -0700" }, "message": "Merge changes from topic \"am-1155d171-2145-4903-8420-80ecfd6c6b08\" into oc-dev\nam: d0025407df\n\nChange-Id: I7186be0877b4649e3246a05ea610c7c5ee75e542\n" } ], "next": "786ae0d32260c0c42c13b4cc3cf07ef9ccc92494" }