)]}' { "log": [ { "commit": "004511660671511ae88e0e837a6f92db28eadaef", "tree": "f8999414faa4488e165a3f86b51c73f58609212b", "parents": [ "d6912500c34506b0bfd1c0e472cefc60195a15eb" ], "author": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Tue Oct 03 07:44:08 2017 -0700" }, "committer": { "name": "Adam Lesinski", "email": "adamlesinski@google.com", "time": "Thu Oct 19 12:50:53 2017 -0700" }, "message": "AAPT2: Define and Implement AAPT Container Format\n\nAAPT Container Format (.apc) is a simple container that\nenumerates the various intermediate files that AAPT2 generates\nduring the compile phase.\n\nThe format is defined in formats.md.\n\nFor now, continue using the .flat extension for the container file,\nand keep making use of the .flata zip for storing multiple files.\nThis will allow easier integration with existing build systems and allow\nthe evolution of the APC format to better handle arbitrarily large\nfiles.\n\nTest: make aapt2_tests\nChange-Id: Id7216e5b76316bdd683f0fa4eaf2d2da273ba815\n" }, { "commit": "d6912500c34506b0bfd1c0e472cefc60195a15eb", "tree": "fb8f88559e09aeef2b1a2649744293854c45af3a", "parents": [ "9a164691d7b3cd644b1b3692e01703c75977fb95", "b8f078c9a0c9f32ad84c475c26299ecb00962ffa" ], "author": { "name": "Donald Chai", "email": "dchai@google.com", "time": "Thu Oct 19 19:33:56 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 19:33:56 2017 +0000" }, "message": "Merge \"AAPT2: Sanitize resource qualifiers before using in split names.\"" }, { "commit": "9a164691d7b3cd644b1b3692e01703c75977fb95", "tree": "d6dec8cf6cb8448121a4fb194170c709f6a01280", "parents": [ "2d3365e1ae5ce5efe29a4e5fc3edfec2db35ab84", "008585f7d50b4ca89f1e538aa94240e3dbc5078c" ], "author": { "name": "Android Build Merger (Role)", "email": "android-build-merger@google.com", "time": "Thu Oct 19 18:51:46 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 18:51:46 2017 +0000" }, "message": "Merge \"Merge \"Add storageId to moveObjects\" am: 1f4f6d2a18 am: 18abf57e99 am: 59ff05a59f am: 3b997d0773\"" }, { "commit": "008585f7d50b4ca89f1e538aa94240e3dbc5078c", "tree": "f9ef575e53463ed9233f5c6929c43535519da3ca", "parents": [ "c35ca6de375a1a17a3e070f85e7cf15272d92181", "3b997d077317f536df7597032bc14d1e18e1fe17" ], "author": { "name": "Jerry Zhang", "email": "zhangjerry@google.com", "time": "Thu Oct 19 18:48:11 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 18:48:11 2017 +0000" }, "message": "Merge \"Add storageId to moveObjects\" am: 1f4f6d2a18 am: 18abf57e99 am: 59ff05a59f\nam: 3b997d0773\n\nChange-Id: I93d06954ceb4942e3efdbd9e5ce2ddb25dee8ab7\n" }, { "commit": "2d3365e1ae5ce5efe29a4e5fc3edfec2db35ab84", "tree": "5aa22ba6c30ee7039038bcd9232db5ac99b7cebf", "parents": [ "c35ca6de375a1a17a3e070f85e7cf15272d92181", "1bfe59d17955bf75b44600b18927d07552e2378c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 18:47:02 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 18:47:02 2017 +0000" }, "message": "Merge \"Start IoT System Service from SystemServer\"" }, { "commit": "3b997d077317f536df7597032bc14d1e18e1fe17", "tree": "1185770118fe26af1a3d567d5d83235144a1a746", "parents": [ "9c6f24d1ee8e2b440ec70262f6c5c0d9a7237e78", "59ff05a59f334d9d4043b18d1cadbe027c3ff3ad" ], "author": { "name": "Jerry Zhang", "email": "zhangjerry@google.com", "time": "Thu Oct 19 18:36:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 18:36:22 2017 +0000" }, "message": "Merge \"Add storageId to moveObjects\" am: 1f4f6d2a18 am: 18abf57e99\nam: 59ff05a59f\n\nChange-Id: I024be0c75e20e58152dbe0c81e5548d70f06a925\n" }, { "commit": "59ff05a59f334d9d4043b18d1cadbe027c3ff3ad", "tree": "fa95f43db9e4fb93ef59b5f1e5264ecc3f71bb1e", "parents": [ "f92bfc3b77bcff1adb456dd51bd799811e52a698", "18abf57e9961a9f793ad1598848940f63d9a92c9" ], "author": { "name": "Jerry Zhang", "email": "zhangjerry@google.com", "time": "Thu Oct 19 18:22:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 18:22:46 2017 +0000" }, "message": "Merge \"Add storageId to moveObjects\" am: 1f4f6d2a18\nam: 18abf57e99\n\nChange-Id: Ieb79d5a10307c47cd772ae5ef621717d5c90cdc2\n" }, { "commit": "18abf57e9961a9f793ad1598848940f63d9a92c9", "tree": "314183c8d8557a87b9ae85b257b36627ec5d6023", "parents": [ "d3a57920248c0385d4063bc906b78c5a8bfec054", "1f4f6d2a18e3d433ff2f1566370b696d6a6e9c9a" ], "author": { "name": "Jerry Zhang", "email": "zhangjerry@google.com", "time": "Thu Oct 19 18:11:49 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 18:11:49 2017 +0000" }, "message": "Merge \"Add storageId to moveObjects\"\nam: 1f4f6d2a18\n\nChange-Id: Id4f53fc283850d8f93cde7e67581355dc50e595e\n" }, { "commit": "1f4f6d2a18e3d433ff2f1566370b696d6a6e9c9a", "tree": "fb84d1a0b4e3477109878632ed37add873483c85", "parents": [ "b6df7f0d35d3a3401e5ff0b1fdfb376a7f908066", "def7b1930013e31e85bed904ff38cc3af71e75b2" ], "author": { "name": "Jerry Zhang", "email": "zhangjerry@google.com", "time": "Thu Oct 19 17:55:34 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 19 17:55:34 2017 +0000" }, "message": "Merge \"Add storageId to moveObjects\"" }, { "commit": "c35ca6de375a1a17a3e070f85e7cf15272d92181", "tree": "fba948329afb4f64a3939cdf8cbd1c4b25746ed9", "parents": [ "4b11fce4a44721cebe207a92ae57f3fadc62d20b", "9c6f24d1ee8e2b440ec70262f6c5c0d9a7237e78" ], "author": { "name": "Benedict Wong", "email": "benedictwong@google.com", "time": "Thu Oct 19 17:48:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 17:48:53 2017 +0000" }, "message": "Merge \"Add support for AES-GCM-ESP as an IPSec algorithm\" am: b6df7f0d35 am: d3a5792024 am: f92bfc3b77\nam: 9c6f24d1ee\n\nChange-Id: Ie9a43c7f0519a2d7ac3326944608190503804483\n" }, { "commit": "9c6f24d1ee8e2b440ec70262f6c5c0d9a7237e78", "tree": "6a9b0c2a41e9d1f488e5a170eb238a8e51f976eb", "parents": [ "d6e61836ac558994ff5fb57494ea3bb859ab5645", "f92bfc3b77bcff1adb456dd51bd799811e52a698" ], "author": { "name": "Benedict Wong", "email": "benedictwong@google.com", "time": "Thu Oct 19 17:37:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 17:37:22 2017 +0000" }, "message": "Merge \"Add support for AES-GCM-ESP as an IPSec algorithm\" am: b6df7f0d35 am: d3a5792024\nam: f92bfc3b77\n\nChange-Id: I49932a5fc048b4a60512fac45a3537f050397168\n" }, { "commit": "4b11fce4a44721cebe207a92ae57f3fadc62d20b", "tree": "d6fe33cdb1482e129d41af1b259e75a8cc0137ee", "parents": [ "c848d8968a76439941cb8464cd697ebb0f61f8ec", "40dc2114dde504287e98bb7cba05ecce646bf5da" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 17:32:26 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 17:32:26 2017 +0000" }, "message": "Merge \"getPinnedShortcuts() shouldn\u0027t crash with shortcuts with...\"" }, { "commit": "f92bfc3b77bcff1adb456dd51bd799811e52a698", "tree": "76f19aa1c32397dc93d1d2e9cdb6179e429f69d8", "parents": [ "23c2a6578b88f8132a858614cde4112656e2bc0e", "d3a57920248c0385d4063bc906b78c5a8bfec054" ], "author": { "name": "Benedict Wong", "email": "benedictwong@google.com", "time": "Thu Oct 19 17:26:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 17:26:19 2017 +0000" }, "message": "Merge \"Add support for AES-GCM-ESP as an IPSec algorithm\" am: b6df7f0d35\nam: d3a5792024\n\nChange-Id: I5bf43f78716769a6f1f90169f500e9eee7a91f18\n" }, { "commit": "c848d8968a76439941cb8464cd697ebb0f61f8ec", "tree": "3e7c0b89ee35f986cf0851555e41fd96432f7697", "parents": [ "5bd68a0c888df4c712eeea0dc2ef75ea08d02091", "d6e61836ac558994ff5fb57494ea3bb859ab5645" ], "author": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Thu Oct 19 17:26:09 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 17:26:09 2017 +0000" }, "message": "Merge \"Move most android.util.Mutable* classes to framework.\" am: cd06caf10e am: 4719440f3f am: 23c2a6578b\nam: d6e61836ac\n\nChange-Id: Ifec5c8457aa144a909dd694de15d66c550cd7fdc\n" }, { "commit": "5bd68a0c888df4c712eeea0dc2ef75ea08d02091", "tree": "44d8c4c467bf4a26fba82fb6956c8d7057da6c44", "parents": [ "6ac1763521c0d2c4380b6907de51c1ef051734cc", "9a5e67dba90e4ce557bf8c26383660f3d38a7c5a" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Oct 19 17:14:58 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 17:14:58 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into oc-mr1-dev am: db768d45e0 -s ours\nam: 9a5e67dba9 -s ours\n\nChange-Id: I4b26cbf3a5f9c5fadb88bb90db948bc605cd48e5\n" }, { "commit": "d3a57920248c0385d4063bc906b78c5a8bfec054", "tree": "c348cca11b2a6befdedc4a7cc79f7eb0eb83865f", "parents": [ "4719440f3f5157dd07e3497e4b834df7aa7d75e8", "b6df7f0d35d3a3401e5ff0b1fdfb376a7f908066" ], "author": { "name": "Benedict Wong", "email": "benedictwong@google.com", "time": "Thu Oct 19 17:14:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 17:14:53 2017 +0000" }, "message": "Merge \"Add support for AES-GCM-ESP as an IPSec algorithm\"\nam: b6df7f0d35\n\nChange-Id: Ic099206a28c4f21fa796969c953a8d4e81e8495b\n" }, { "commit": "6ac1763521c0d2c4380b6907de51c1ef051734cc", "tree": "44d8c4c467bf4a26fba82fb6956c8d7057da6c44", "parents": [ "8cb2dcf08184c32d00e2f40cba9666f6eab80970", "301bf35e2df9e3f2efa5dbf1c2df69e10be7f6e8" ], "author": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Thu Oct 19 17:10:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 17:10:40 2017 +0000" }, "message": "resolve merge conflicts of 5c9e47d28b24 to oc-mr1-dev-plus-aosp\nam: 301bf35e2d -s ours\n\nChange-Id: I94dc1b71d6c9a323173b75b2d71b7da841c460d9\n" }, { "commit": "b6df7f0d35d3a3401e5ff0b1fdfb376a7f908066", "tree": "c86463793b83e9db9fc3dc3b81a8d684200a33b4", "parents": [ "cd06caf10e6a41fd4fb8739c0a03102f0792bd77", "0febe5ece542cf16bc680e72d1484a3f603a18e0" ], "author": { "name": "Benedict Wong", "email": "benedictwong@google.com", "time": "Thu Oct 19 17:06:30 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 19 17:06:30 2017 +0000" }, "message": "Merge \"Add support for AES-GCM-ESP as an IPSec algorithm\"" }, { "commit": "d6e61836ac558994ff5fb57494ea3bb859ab5645", "tree": "c953b378b1627fe13a53f8e49a842cb3b67e9a4c", "parents": [ "9a5e67dba90e4ce557bf8c26383660f3d38a7c5a", "23c2a6578b88f8132a858614cde4112656e2bc0e" ], "author": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Thu Oct 19 16:42:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 16:42:50 2017 +0000" }, "message": "Merge \"Move most android.util.Mutable* classes to framework.\" am: cd06caf10e am: 4719440f3f\nam: 23c2a6578b\n\nChange-Id: I990ecf36ee6d2cd1d55c7cb1e652a8998ff84f35\n" }, { "commit": "23c2a6578b88f8132a858614cde4112656e2bc0e", "tree": "8a5ff9693e7f65dbfde9b6768f296c9d68a197f5", "parents": [ "5c9e47d28b249395fa74787065f83769b886c036", "4719440f3f5157dd07e3497e4b834df7aa7d75e8" ], "author": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Thu Oct 19 16:31:25 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 16:31:25 2017 +0000" }, "message": "Merge \"Move most android.util.Mutable* classes to framework.\" am: cd06caf10e\nam: 4719440f3f\n\nChange-Id: I699ae1fdec65f8c0ed584c13424e922f226d3ce0\n" }, { "commit": "4719440f3f5157dd07e3497e4b834df7aa7d75e8", "tree": "8d4cf59d23b1106ff4fa726337a33ecb9549e823", "parents": [ "07efe116b1055ebead525cc365f22114913a4e9a", "cd06caf10e6a41fd4fb8739c0a03102f0792bd77" ], "author": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Thu Oct 19 16:18:44 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 16:18:44 2017 +0000" }, "message": "Merge \"Move most android.util.Mutable* classes to framework.\"\nam: cd06caf10e\n\nChange-Id: I25fd01bd4bc8c582e6cb79a03de47847b46bcb83\n" }, { "commit": "cd06caf10e6a41fd4fb8739c0a03102f0792bd77", "tree": "886d9af25f49cda73bec7a649f8919743efc55f1", "parents": [ "5f04db96b3a397b7c1a96e2c768bdddab6080159", "49818415ebd5b53deadfc59680b6a24e7fced363" ], "author": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Thu Oct 19 16:08:07 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 19 16:08:07 2017 +0000" }, "message": "Merge \"Move most android.util.Mutable* classes to framework.\"" }, { "commit": "9a5e67dba90e4ce557bf8c26383660f3d38a7c5a", "tree": "ff127ed004f4707c41fc2d6261b38831f43e6af6", "parents": [ "301bf35e2df9e3f2efa5dbf1c2df69e10be7f6e8", "db768d45e0f9d3fb9928257324249a9cdad7b539" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Oct 19 16:02:24 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 16:02:24 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into oc-mr1-dev\nam: db768d45e0 -s ours\n\nChange-Id: Ie3665e5f71cf66f0eb36741a42244043b70b78b4\n" }, { "commit": "db768d45e0f9d3fb9928257324249a9cdad7b539", "tree": "a43739f2b162413ecd83ca6a9bc953e223cb7c9f", "parents": [ "ea0b574ea52a875359bb545a8c6e3245d676bb96", "76cb516fa76482132fd0630de82a047647c6896c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 15:52:22 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 15:52:22 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into oc-mr1-dev" }, { "commit": "40dc2114dde504287e98bb7cba05ecce646bf5da", "tree": "aa20189ef2e704d4d59b473d07f06be5ffaeb94e", "parents": [ "377c7c2523aafdf2225f977bb432b382228ad155" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Wed Oct 18 12:52:45 2017 -0700" }, "committer": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Thu Oct 19 15:48:29 2017 +0000" }, "message": "getPinnedShortcuts() shouldn\u0027t crash with shortcuts with...\n\n... no activities.\n\nBug 67931644\n\nTest: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests\nTest: adb shell am instrument -w -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\nChange-Id: Icea651cf7880c5389467285e9cae3a52c4993669\n" }, { "commit": "8cb2dcf08184c32d00e2f40cba9666f6eab80970", "tree": "44d8c4c467bf4a26fba82fb6956c8d7057da6c44", "parents": [ "d2df1ce3e99aa676067c2c9496e4e0046b2e67a2", "ee36f6fedb961387279d8d345065e6a9bbf3c97e" ], "author": { "name": "Android Build Merger (Role)", "email": "android-build-merger@google.com", "time": "Thu Oct 19 15:33:57 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 15:33:57 2017 +0000" }, "message": "Merge \"Merge \"Settings: Fix leak of BroadcastReceiver intents\" am: 3499af28c4 am: 1b4a0abdbb am: 517b35fa1c am: d2ff3244dc\"" }, { "commit": "301bf35e2df9e3f2efa5dbf1c2df69e10be7f6e8", "tree": "ff127ed004f4707c41fc2d6261b38831f43e6af6", "parents": [ "d2ff3244dc64b05b3b9e2bedbdd120a8dfdde022", "5c9e47d28b249395fa74787065f83769b886c036" ], "author": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Thu Oct 19 16:12:57 2017 +0100" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@google.com", "time": "Thu Oct 19 15:33:17 2017 +0000" }, "message": "resolve merge conflicts of 5c9e47d28b24 to oc-mr1-dev-plus-aosp\n\nTest: This merge conflict was automatically resolved by meld.\n The automatic resolution of the same merge conflict by meld\n from cherrypicking this CL into internal-master has passed\n Treehugger (and was already submitted).\nExempt-From-Owner-Approval: Resolving merge conflicts with no deltas\nChange-Id: I61f15aeb79c1ad26cc7c51be2af59ecb7b672a7b\n" }, { "commit": "ee36f6fedb961387279d8d345065e6a9bbf3c97e", "tree": "d60bb7b831b548f934b63cb969612381a13c07c6", "parents": [ "2058da0e272a672dd83d6adb22816ee141a4e758", "d2ff3244dc64b05b3b9e2bedbdd120a8dfdde022" ], "author": { "name": "Manu Viswanadhan", "email": "manuv@codeaurora.org", "time": "Thu Oct 19 15:31:41 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 15:31:41 2017 +0000" }, "message": "Merge \"Settings: Fix leak of BroadcastReceiver intents\" am: 3499af28c4 am: 1b4a0abdbb am: 517b35fa1c\nam: d2ff3244dc\n\nChange-Id: I57c99fcf7698535177c23b62e45f8e1a032a7220\n" }, { "commit": "d2df1ce3e99aa676067c2c9496e4e0046b2e67a2", "tree": "c5e065931f511107923f261af29d1e6660156ffb", "parents": [ "31a11dd4080e84ded9ffa88c367454601583eee8", "11d38e6e1691bb27ea68a719cc0d23cc7ecb4666" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 15:30:51 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 15:30:51 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\"" }, { "commit": "31a11dd4080e84ded9ffa88c367454601583eee8", "tree": "53f8b25040180f9ed424a466baa04901f89d35a8", "parents": [ "2058da0e272a672dd83d6adb22816ee141a4e758", "408af019e195b82334522339bd7e32fdea5f0b8f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 15:29:04 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 15:29:04 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\"" }, { "commit": "2058da0e272a672dd83d6adb22816ee141a4e758", "tree": "f7d3a4383e5ad836626dd3bfec2cae7b255f29cc", "parents": [ "2919a6e6d3864cbdadecbe1aa85cdb986a68ff6a", "60b9835e7d140dcc8627ef834215d48f62139137" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 15:22:09 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 15:22:09 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99 am: a9d3b4d806 am: ea0b574ea5\nam: 60b9835e7d -s ours\n\nChange-Id: Ie97dd3b28cc068043f66311381750f6e07e66100\n" }, { "commit": "2919a6e6d3864cbdadecbe1aa85cdb986a68ff6a", "tree": "f7d3a4383e5ad836626dd3bfec2cae7b255f29cc", "parents": [ "6d332cde18314b0a25c0fa8b220d5f616bded2d0", "09ec0dc6f66a0b12c0348c561b1661f9e70a7759" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 15:13:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 15:13:57 2017 +0000" }, "message": "Merge \"Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99 am: a9d3b4d806 am: 1fa3f2a9d0\" into oc-mr1-dev-plus-aosp\nam: 09ec0dc6f6 -s ours\n\nChange-Id: I876dac52695c20b472e9ec36f02e309967a483a9\n" }, { "commit": "6d332cde18314b0a25c0fa8b220d5f616bded2d0", "tree": "f7d3a4383e5ad836626dd3bfec2cae7b255f29cc", "parents": [ "e3692bdb67d9d3cfa0741158e8706ed7cfb30abe", "8cd9c1e9ad5d529bd6fad8fcb48af1fa426ecd5a" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 15:08:42 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 15:08:42 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2 am: b614e5560e am: 1d1aac8621\nam: 8cd9c1e9ad\n\nChange-Id: I01ce4add382ac8f4ae3462b165b6e5897e68c82b\n" }, { "commit": "e3692bdb67d9d3cfa0741158e8706ed7cfb30abe", "tree": "f7d3a4383e5ad836626dd3bfec2cae7b255f29cc", "parents": [ "6f0e008318f61ec5cd4e75ead485fb888a643617", "77c982f28b8d1128d6bec0fcc814f4ec818576bd" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 14:54:54 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 14:54:54 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2 am: b614e5560e am: 5cf9cbd3a3\nam: 77c982f28b\n\nChange-Id: I362db6f48b1a16700d3e374fae230969dd535996\n" }, { "commit": "6f0e008318f61ec5cd4e75ead485fb888a643617", "tree": "f7d3a4383e5ad836626dd3bfec2cae7b255f29cc", "parents": [ "f26a40f7ee14c9a620d6cf78ca6c363c1e3bc675", "9a7a6e20009c4e21062ed8e2e8b6a726e4dc56f5" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Thu Oct 19 14:41:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 14:41:26 2017 +0000" }, "message": "Merge \"Preserve ranking attrs of resolve infos for installing a feature split\" into oc-mr1-dev am: 8f231b7aa6\nam: 9a7a6e2000\n\nChange-Id: I4e359a54b1eb6a681e4e6fabe31e0cf20a1c87a9\n" }, { "commit": "5c9e47d28b249395fa74787065f83769b886c036", "tree": "a00e09fd4c934c9daf97dd95ccb0f0a4cf23f988", "parents": [ "517b35fa1cc96afe0eb3cb889e1b765dd7cbce19", "07efe116b1055ebead525cc365f22114913a4e9a" ], "author": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Thu Oct 19 14:34:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 14:34:36 2017 +0000" }, "message": "Merge \"Framework: Prefer android.system.Os over libcore.io.Libcore.os\" am: 5f04db96b3\nam: 07efe116b1\n\nChange-Id: I1c9f25ea1ac00037cc90dfe4c8c2552f90a33ecd\n" }, { "commit": "f26a40f7ee14c9a620d6cf78ca6c363c1e3bc675", "tree": "0b51c61d40182e6681cf7a487efc92411a45e56d", "parents": [ "98369ca0607f426651262573c746ef3e29de730c", "a0624d59b5d07de166b14dedef681dead6550ddb" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 19 14:29:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 14:29:13 2017 +0000" }, "message": "Revert \"Clearing up invalid entries when SyncStorageEngine starts\" am: 4a9d358448 am: 0597a93629 -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3 am: d1e7db9f4a am: 9ecbe6f6e7 am: a9e9e83964 am: f580b0f6a4 am: 2bded32359 am: da605f5a0e\nam: a0624d59b5\n\nChange-Id: I570b050ce2ec379f62c122ace621d01fc0cef76a\n" }, { "commit": "07efe116b1055ebead525cc365f22114913a4e9a", "tree": "5e3c0e09cae61cb0915990435eb5b14f61451377", "parents": [ "1b4a0abdbb7ff8218de7592301a7d5d2baab89cb", "5f04db96b3a397b7c1a96e2c768bdddab6080159" ], "author": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Thu Oct 19 14:25:12 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 14:25:12 2017 +0000" }, "message": "Merge \"Framework: Prefer android.system.Os over libcore.io.Libcore.os\"\nam: 5f04db96b3\n\nChange-Id: If85216d03022708787a7218e494434453d5548e3\n" }, { "commit": "98369ca0607f426651262573c746ef3e29de730c", "tree": "0b51c61d40182e6681cf7a487efc92411a45e56d", "parents": [ "ee7345fc87799927e08c1cdedacd4688cd4fd8db", "98e12851336b7db16e583f9afac63ecc97465980" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 19 14:16:25 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 14:16:25 2017 +0000" }, "message": "Revert \"Clearing up invalid entries when SyncStorageEngine starts\" am: 4a9d358448 am: 0597a93629 -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3 am: d1e7db9f4a am: 9ecbe6f6e7 am: a9e9e83964 am: f580b0f6a4 am: 2bded32359 am: 7f9454d63d\nam: 98e1285133\n\nChange-Id: Ic61a038f2b8477fe6051df3b5cf6e57c0cc9876d\n" }, { "commit": "5f04db96b3a397b7c1a96e2c768bdddab6080159", "tree": "772ea90715730d5b0f1e7fda99a6b363094d61f5", "parents": [ "3499af28c45f1daf14806ee2de536abf48d4d9f1", "6217e37d30042fd78d17a8d5145f578279d60808" ], "author": { "name": "Tobias Thierer", "email": "tobiast@google.com", "time": "Thu Oct 19 14:15:52 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 19 14:15:52 2017 +0000" }, "message": "Merge \"Framework: Prefer android.system.Os over libcore.io.Libcore.os\"" }, { "commit": "ee7345fc87799927e08c1cdedacd4688cd4fd8db", "tree": "0b51c61d40182e6681cf7a487efc92411a45e56d", "parents": [ "1ed9a0ea695e77a246da85ae0c4ce30ae430ea36", "6bf609439467f101a2c7bc61bcdcc83c381a89bd" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Thu Oct 19 14:03:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 14:03:19 2017 +0000" }, "message": "Merge \"DO NOT MERGE getPinnedShortcuts() shouldn\u0027t crash with shortcuts with...\" into oc-mr1-dev am: c63c9f8ae1\nam: 6bf6094394 -s ours\n\nChange-Id: Icf96cdd5c9a1ea8fdf9c6dd04a0791a7a347af34\n" }, { "commit": "1ed9a0ea695e77a246da85ae0c4ce30ae430ea36", "tree": "0b51c61d40182e6681cf7a487efc92411a45e56d", "parents": [ "2c731456d613ffd952adb5786c0600ad44337b4f", "fdde7e4aa95eafdaee8e0391b6d9375ecff6b049" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 19 13:59:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 13:59:10 2017 +0000" }, "message": "Merge \"Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036 -s ours am: 5bd2c48ac0 -s ours am: 54cbf03ecb -s ours am: 88f4c765a6 -s ours am: 62dbcc9af0 -s ours am: 17f0e4bc00 -s ours am: f0f1b1fe9e -s ours am: 9913314caf -s ours am: 28a1dd26e8 -s ours am: 976b873b98 -s ours am: 174d0688cc -s ours am: 93f47a8662 -s ours am: 272c482c2a -s ours\" into oc-mr1-dev-plus-aosp\nam: fdde7e4aa9 -s ours\n\nChange-Id: I7e44f829057c125c604b9650defd13066cc1e69a\n" }, { "commit": "2c731456d613ffd952adb5786c0600ad44337b4f", "tree": "0b51c61d40182e6681cf7a487efc92411a45e56d", "parents": [ "6e80e4882b00cd495011f0c32944dc43e3911f76", "590e1750156798d4604e039301c97db63ce75099" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 19 13:06:54 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 13:06:54 2017 +0000" }, "message": "Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036 -s ours am: 5bd2c48ac0 -s ours am: 54cbf03ecb -s ours am: 88f4c765a6 -s ours am: 62dbcc9af0 -s ours am: 17f0e4bc00 -s ours am: f0f1b1fe9e -s ours am: 9913314caf -s ours am: 28a1dd26e8 -s ours am: 976b873b98 -s ours am: 174d0688cc -s ours am: 93f47a8662 -s ours am: 272c482c2a -s ours\nam: 590e175015 -s ours\n\nChange-Id: I733f3afe3b44c9d44bb2c79d9ab23630129bef19\n" }, { "commit": "6e80e4882b00cd495011f0c32944dc43e3911f76", "tree": "0b51c61d40182e6681cf7a487efc92411a45e56d", "parents": [ "208f0970d57808a346acf79cdeb8bbcd1a060fb8", "83dbda25589e20fcf3b3508c945cab7c358e516f" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 19 12:19:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 12:19:19 2017 +0000" }, "message": "Clearing up invalid entries when SyncStorageEngine starts am: 89c0dbca0f am: 53a2e46036 -s ours am: 5bd2c48ac0 -s ours am: 54cbf03ecb -s ours am: 88f4c765a6 -s ours am: 62dbcc9af0 -s ours am: 17f0e4bc00 -s ours am: f0f1b1fe9e -s ours am: 9913314caf -s ours am: 28a1dd26e8 -s ours am: 976b873b98 -s ours am: 174d0688cc -s ours am: 93f47a8662 -s ours am: beb43df980 -s ours\nam: 83dbda2558 -s ours\n\nChange-Id: Iab1b28636ad59295a7185ba04f6999e4fbf95f09\n" }, { "commit": "208f0970d57808a346acf79cdeb8bbcd1a060fb8", "tree": "0b51c61d40182e6681cf7a487efc92411a45e56d", "parents": [ "9069f179817f6bae718955f2d9edf8293c312726", "96aac9b3754b9f85b3db87435d890c43092be20d" ], "author": { "name": "Joachim Sauer", "email": "jsauer@google.com", "time": "Thu Oct 19 11:48:58 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 11:48:58 2017 +0000" }, "message": "Merge \"Framework: Prefer android.system.Os over libcore.io.Libcore.os\"" }, { "commit": "408af019e195b82334522339bd7e32fdea5f0b8f", "tree": "ed0fdf8ad3465fcc2426bf035b7dd05d2aca120c", "parents": [ "f40e381988977f2e361c07f84fdd034a4dffe823" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Oct 19 03:34:53 2017 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Oct 19 03:34:53 2017 -0700" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: If3f4f4d5c3e397916bd4c4a7a41615ea966a8cb7\nAuto-generated-cl: translation import\nExempt-From-Owner-Approval: translation import\n" }, { "commit": "9069f179817f6bae718955f2d9edf8293c312726", "tree": "7d379e8b059818f141e55ed1badc6349d9d9b409", "parents": [ "3a88464cfc6df1acda68d48413aa13ff9b534459", "e34ad1871b9f7da309af0b4e11b93b1be834f38b" ], "author": { "name": "Mihai Popa", "email": "popam@google.com", "time": "Thu Oct 19 10:12:09 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 10:12:09 2017 +0000" }, "message": "Merge \"Enable the public TTC index attribute for fonts\"" }, { "commit": "76cb516fa76482132fd0630de82a047647c6896c", "tree": "5455e4346a95d4b26e6dd6bb9dae3f4f19dab306", "parents": [ "272c482c2ad5ad72c8b053432fdff02281307989" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Oct 19 01:21:34 2017 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Oct 19 01:21:34 2017 -0700" }, "message": "Import translations. DO NOT MERGE\n\nAuto-generated-cl: translation import\nExempt-From-Owner-Approval: translation import\n\nBug: 64712476\nChange-Id: I359b63c9efc317b1a6053d73321a3769871efbf3\n" }, { "commit": "11d38e6e1691bb27ea68a719cc0d23cc7ecb4666", "tree": "e930d7f3e7d48442cb7bd9ae6bb0b34da5b4bc10", "parents": [ "f40e381988977f2e361c07f84fdd034a4dffe823" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Oct 19 01:03:20 2017 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Oct 19 01:03:20 2017 -0700" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I9d9b1f6300a25fef3afbbd6fc52857d21320e91c\nAuto-generated-cl: translation import\nExempt-From-Owner-Approval: translation import\n" }, { "commit": "3a88464cfc6df1acda68d48413aa13ff9b534459", "tree": "69da73e8d316a950fdc9438b7b9d671626c55391", "parents": [ "9af741d605891ec5459fd6843757c49b7a5f4748", "930328ca97bd1ea6e1d56743712fb937492c34b7" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 07:01:10 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 07:01:10 2017 +0000" }, "message": "Merge \"Annotate threads for some IME handling methods\"" }, { "commit": "b8f078c9a0c9f32ad84c475c26299ecb00962ffa", "tree": "bc803682529c864d2475150920207e77c565ac27", "parents": [ "96a30ab84c9e856cd7152d66d603205c3daff36e" ], "author": { "name": "Donald Chai", "email": "dchai@google.com", "time": "Wed Oct 18 23:51:18 2017 -0700" }, "committer": { "name": "Donald Chai", "email": "dchai@google.com", "time": "Wed Oct 18 23:58:42 2017 -0700" }, "message": "AAPT2: Sanitize resource qualifiers before using in split names.\n\nFixes: 67960909\nTest: UtilTest.SplitNamesAreSanitized\nChange-Id: I9ba1b8430a00cc7ce981075a60388f275c41dbea\n" }, { "commit": "d2ff3244dc64b05b3b9e2bedbdd120a8dfdde022", "tree": "d722276a6ad9f4acc3468d750faa9d3f315a8c1a", "parents": [ "60b9835e7d140dcc8627ef834215d48f62139137", "517b35fa1cc96afe0eb3cb889e1b765dd7cbce19" ], "author": { "name": "Manu Viswanadhan", "email": "manuv@codeaurora.org", "time": "Thu Oct 19 06:21:39 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 06:21:39 2017 +0000" }, "message": "Merge \"Settings: Fix leak of BroadcastReceiver intents\" am: 3499af28c4 am: 1b4a0abdbb\nam: 517b35fa1c\n\nChange-Id: I11f0b50f93e2a722ecf3c8bd398462c967d9bfb2\n" }, { "commit": "517b35fa1cc96afe0eb3cb889e1b765dd7cbce19", "tree": "5057eaf1927385752a2fcf9b00ef3ea463843cba", "parents": [ "1fa3f2a9d007539e3b3113f0ef949eff96cf689e", "1b4a0abdbb7ff8218de7592301a7d5d2baab89cb" ], "author": { "name": "Manu Viswanadhan", "email": "manuv@codeaurora.org", "time": "Thu Oct 19 06:12:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 06:12:20 2017 +0000" }, "message": "Merge \"Settings: Fix leak of BroadcastReceiver intents\" am: 3499af28c4\nam: 1b4a0abdbb\n\nChange-Id: I4779532a0be4e8a821e521d1b962b4c57ecf86b8\n" }, { "commit": "1b4a0abdbb7ff8218de7592301a7d5d2baab89cb", "tree": "b5cbb069ae314fa656af4cdfebb3016eca211215", "parents": [ "9fba6c2fe1187ecdb4dbb309fcccd5e89921918a", "3499af28c45f1daf14806ee2de536abf48d4d9f1" ], "author": { "name": "Manu Viswanadhan", "email": "manuv@codeaurora.org", "time": "Thu Oct 19 06:02:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 06:02:23 2017 +0000" }, "message": "Merge \"Settings: Fix leak of BroadcastReceiver intents\"\nam: 3499af28c4\n\nChange-Id: I2b0f3920f39981956d25017999a25799d995252b\n" }, { "commit": "3499af28c45f1daf14806ee2de536abf48d4d9f1", "tree": "7ca653ba491fe112e908faa7f6d47667158f41a0", "parents": [ "3851f132d10db766f1d9a49099ec19a84957afad", "d199295ef36b28aa5893f00b12e430acaaf4aa87" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 05:53:23 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 19 05:53:23 2017 +0000" }, "message": "Merge \"Settings: Fix leak of BroadcastReceiver intents\"" }, { "commit": "9af741d605891ec5459fd6843757c49b7a5f4748", "tree": "69958a3b2662d9c3a43ea7273e50d6c9d7b08027", "parents": [ "39615fcc57747096f34db9b53e5fe77241e05baf", "16f040770814f000f407026dea337f9ec15f5fc0" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 05:46:36 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 05:46:36 2017 +0000" }, "message": "Merge \"Add missing JavaDoc for IMS.InputMethodImpl\"" }, { "commit": "39615fcc57747096f34db9b53e5fe77241e05baf", "tree": "11631d297a4ce09a18c302b4bef692e0b2bd4a9f", "parents": [ "4651cdf9cc6018840ed9b810838635a2e43d966c", "6f0bf747ebcf856272a8ebbc509d74e70d33bd31" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 05:37:55 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 05:37:55 2017 +0000" }, "message": "Merge \"No-op code cleanup for IInputMethodWrapper\"" }, { "commit": "4651cdf9cc6018840ed9b810838635a2e43d966c", "tree": "68e6d327ce7935232449c58b1c54de134733a7a8", "parents": [ "8c987db23e469c7b823d9b36f055eafaaf555821", "252e0908bd729eaf41c6d53af0ea8111bd9464d7" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 05:16:56 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 05:16:56 2017 +0000" }, "message": "Merge \"Location \u0026 GNSS Measurement Documetation Fixes\"" }, { "commit": "60b9835e7d140dcc8627ef834215d48f62139137", "tree": "9bd8b076e19034ee9c07ad53310fac74e4d03702", "parents": [ "09ec0dc6f66a0b12c0348c561b1661f9e70a7759", "ea0b574ea52a875359bb545a8c6e3245d676bb96" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 04:26:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 04:26:57 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99 am: a9d3b4d806\nam: ea0b574ea5\n\nChange-Id: I998c65ff305494f8527f97c4b4d28fb4f791585d\n" }, { "commit": "09ec0dc6f66a0b12c0348c561b1661f9e70a7759", "tree": "9bd8b076e19034ee9c07ad53310fac74e4d03702", "parents": [ "8cd9c1e9ad5d529bd6fad8fcb48af1fa426ecd5a", "2366ea9e617f6d89e2813dc61d15e4558af59baf" ], "author": { "name": "Android Build Merger (Role)", "email": "android-build-merger@google.com", "time": "Thu Oct 19 04:16:51 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 04:16:51 2017 +0000" }, "message": "Merge \"Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99 am: a9d3b4d806 am: 1fa3f2a9d0\" into oc-mr1-dev-plus-aosp" }, { "commit": "2366ea9e617f6d89e2813dc61d15e4558af59baf", "tree": "9bd8b076e19034ee9c07ad53310fac74e4d03702", "parents": [ "77c982f28b8d1128d6bec0fcc814f4ec818576bd", "1fa3f2a9d007539e3b3113f0ef949eff96cf689e" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 04:15:24 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 04:15:24 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99 am: a9d3b4d806\nam: 1fa3f2a9d0\n\nChange-Id: I2847d3a98f87781d601406283a6909f55fe0db82\n" }, { "commit": "8cd9c1e9ad5d529bd6fad8fcb48af1fa426ecd5a", "tree": "9bd8b076e19034ee9c07ad53310fac74e4d03702", "parents": [ "77c982f28b8d1128d6bec0fcc814f4ec818576bd", "1d1aac8621aecbbb2d0fd4795246a487e44a41be" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 04:09:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 04:09:18 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2 am: b614e5560e\nam: 1d1aac8621\n\nChange-Id: I4142801a260251282d78a8e1c4b69a6d7b4b3b54\n" }, { "commit": "77c982f28b8d1128d6bec0fcc814f4ec818576bd", "tree": "9bd8b076e19034ee9c07ad53310fac74e4d03702", "parents": [ "9a7a6e20009c4e21062ed8e2e8b6a726e4dc56f5", "5cf9cbd3a38a9630a892d48b26b3a511a9e4489a" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 03:59:12 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 03:59:12 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2 am: b614e5560e\nam: 5cf9cbd3a3\n\nChange-Id: I4d24939ad00fdf262e8a81c2a2468645093601cf\n" }, { "commit": "8c987db23e469c7b823d9b36f055eafaaf555821", "tree": "fcf0a9120d8320283b32f3db5da8f557c46dcf1c", "parents": [ "17e973595540e8432d195ee21cba177ef0b15bb4", "2b8a5e11dc452c11a18eaaab70b6c268d46b8ddd" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 03:58:43 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 03:58:43 2017 +0000" }, "message": "Merge \"Fix invisible SurfaceViews\"" }, { "commit": "1fa3f2a9d007539e3b3113f0ef949eff96cf689e", "tree": "24d09af8eff4d7a6ead181faa4c48b9982e0a137", "parents": [ "5cf9cbd3a38a9630a892d48b26b3a511a9e4489a", "a9d3b4d80676abe828014dbf48bca5266f8d7496" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 03:58:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 03:58:38 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99\nam: a9d3b4d806\n\nChange-Id: I325ff1074f1481ffdb661a8bee155b64e7586f1b\n" }, { "commit": "ea0b574ea52a875359bb545a8c6e3245d676bb96", "tree": "5cf35302d2a2222577f676df928f1247e1e6c08d", "parents": [ "1d1aac8621aecbbb2d0fd4795246a487e44a41be", "a9d3b4d80676abe828014dbf48bca5266f8d7496" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 03:58:35 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 03:58:35 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d -s ours am: 1ce0456b99\nam: a9d3b4d806\n\nChange-Id: Id867bdf6b1756dd2a1cf8a9229d61125aeccf463\n" }, { "commit": "1d1aac8621aecbbb2d0fd4795246a487e44a41be", "tree": "5cf35302d2a2222577f676df928f1247e1e6c08d", "parents": [ "8f231b7aa6622c4add467c7145910936acf33d66", "b614e5560e67f0d3ba93e77839ddf8a99747aa3e" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 03:43:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 03:43:31 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2\nam: b614e5560e\n\nChange-Id: If3c96f55d78b11e7372ca8783cf41f9a50984faa\n" }, { "commit": "5cf9cbd3a38a9630a892d48b26b3a511a9e4489a", "tree": "24d09af8eff4d7a6ead181faa4c48b9982e0a137", "parents": [ "7f9454d63d8c0e8c60f404d3b24261dc8b6104b9", "b614e5560e67f0d3ba93e77839ddf8a99747aa3e" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 03:43:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 03:43:28 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2\nam: b614e5560e\n\nChange-Id: I34c80d0a98a7a4ea1c78f5ae8619e9566bb33476\n" }, { "commit": "a9d3b4d80676abe828014dbf48bca5266f8d7496", "tree": "1a94d2393748b061aada9d5abe1fb58710874212", "parents": [ "b614e5560e67f0d3ba93e77839ddf8a99747aa3e", "1ce0456b99918e5dee71e0fbfb88d6999c046aaf" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 03:34:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 03:34:46 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97 am: 93d9ac257d -s ours\nam: 1ce0456b99\n\nChange-Id: I9650a76a4f2dacb2c37e8232409e03c8745383f7\n" }, { "commit": "9a7a6e20009c4e21062ed8e2e8b6a726e4dc56f5", "tree": "9bd8b076e19034ee9c07ad53310fac74e4d03702", "parents": [ "a0624d59b5d07de166b14dedef681dead6550ddb", "8f231b7aa6622c4add467c7145910936acf33d66" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Thu Oct 19 03:26:00 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 03:26:00 2017 +0000" }, "message": "Merge \"Preserve ranking attrs of resolve infos for installing a feature split\" into oc-mr1-dev\nam: 8f231b7aa6\n\nChange-Id: Id85257c481a7d4e387ffc6ee628bfd2986ab5b3c\n" }, { "commit": "b614e5560e67f0d3ba93e77839ddf8a99747aa3e", "tree": "1a94d2393748b061aada9d5abe1fb58710874212", "parents": [ "2bded3235929a9c4df7bc6dab013059ec8f9014c", "65f1a4c4c2f03fdd49a277048ac2446c9c9f47d4" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 03:22:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 03:22:50 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5 am: 8621a28b04 am: 685b515140\nam: 65f1a4c4c2\n\nChange-Id: I97965f18ce2146b65542ef8c2125c88c024c67c8\n" }, { "commit": "930328ca97bd1ea6e1d56743712fb937492c34b7", "tree": "8e8771582e8c71aefdec1e12f66e33349b9f345f", "parents": [ "16f040770814f000f407026dea337f9ec15f5fc0" ], "author": { "name": "Yohei Yukawa", "email": "yukawa@google.com", "time": "Wed Oct 18 20:19:53 2017 -0700" }, "committer": { "name": "Yohei Yukawa", "email": "yukawa@google.com", "time": "Wed Oct 18 20:19:53 2017 -0700" }, "message": "Annotate threads for some IME handling methods\n\nThis is a preparation to work on Bug 36897707.\n\nFor instance, the reason why most of IME-related callbacks in\nInputMethodService get called on the main thread is because\nIInputMethodWrapper keeps forwarding incoming IPCs into the\nmain looper of the IME process as follows:\n\n InputMethodManagerService (IMMS)\n ------\n -\u003e one-way binder IPCs over\tIInputMethod\n ------\n -\u003e IInputMethodWrapper (on the binder thread(s))\n -\u003e Handler (to dispatch tasks to main thread)\n -\u003e InputMethodImpl.* (on the main thread)\n -\u003e InputMethodService.* (on the main thread)\n\nBy adding explicit annotations such as @BinderThread and @MainThread\nin relevant methods, this CL makes that kind of investigation much\neasier than before.\n\nBug: 36897707\nTest: compile\nChange-Id: I8f9afe9a1986a9fa41fb66fdc64e8f0f67e45c2e\n" }, { "commit": "16f040770814f000f407026dea337f9ec15f5fc0", "tree": "4500e49c819f1cf8310306dbe68b03770a495238", "parents": [ "6f0bf747ebcf856272a8ebbc509d74e70d33bd31" ], "author": { "name": "Yohei Yukawa", "email": "yukawa@google.com", "time": "Wed Oct 18 20:19:43 2017 -0700" }, "committer": { "name": "Yohei Yukawa", "email": "yukawa@google.com", "time": "Wed Oct 18 20:19:43 2017 -0700" }, "message": "Add missing JavaDoc for IMS.InputMethodImpl\n\nBug: 36897707\nTest: checkbuild\nChange-Id: If1f7cfbfe333f30468d551e8a92bba9f987e8a06\n" }, { "commit": "6f0bf747ebcf856272a8ebbc509d74e70d33bd31", "tree": "d8f6b07fc665f2cb17cdff0cfd9896fd0b56a77d", "parents": [ "5cd47c904c7ea54d5311f5968dd0a454cfce86cc" ], "author": { "name": "Yohei Yukawa", "email": "yukawa@google.com", "time": "Wed Oct 18 20:19:33 2017 -0700" }, "committer": { "name": "Yohei Yukawa", "email": "yukawa@google.com", "time": "Wed Oct 18 20:19:33 2017 -0700" }, "message": "No-op code cleanup for IInputMethodWrapper\n\nThis CL is a safe and no-op code clean-up, including dead code removal.\nThere should be no behavior change.\n\nTest: continuous tests\nBug: 36897707\nChange-Id: I4a1ad9cb764c7ba82b32e325c4a4b1c8e7296bbf\n" }, { "commit": "8f231b7aa6622c4add467c7145910936acf33d66", "tree": "5cf35302d2a2222577f676df928f1247e1e6c08d", "parents": [ "da605f5a0e66419f0eb2595b21371897e5239a5e", "d96953ad7ab13ec988585dcb93a2a3e2120b23f5" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 03:16:48 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 03:16:48 2017 +0000" }, "message": "Merge \"Preserve ranking attrs of resolve infos for installing a feature split\" into oc-mr1-dev" }, { "commit": "1ce0456b99918e5dee71e0fbfb88d6999c046aaf", "tree": "9519e8bb3ef2f992db905fcc6b303c5038b49f9d", "parents": [ "65f1a4c4c2f03fdd49a277048ac2446c9c9f47d4", "93d9ac257db022426e19e60fa71c14daadb52297" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 03:06:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 03:06:40 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a am: b00fd6bb97\nam: 93d9ac257d -s ours\n\nChange-Id: Ic1a98303821102d3cddbdbf52b98f2739c2507f6\n" }, { "commit": "65f1a4c4c2f03fdd49a277048ac2446c9c9f47d4", "tree": "9519e8bb3ef2f992db905fcc6b303c5038b49f9d", "parents": [ "f580b0f6a445a5c49d3d45d93864f479fbc33249", "685b515140c16f78ab17f9530d31420939b68c0a" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 03:00:17 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 03:00:17 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5 am: 8621a28b04\nam: 685b515140\n\nChange-Id: I42139be71b55e6a9a7c88b97cd99936216541cc3\n" }, { "commit": "93d9ac257db022426e19e60fa71c14daadb52297", "tree": "2a11afc6708a91bb49c2bd8f5dec6d0fade7d5a7", "parents": [ "685b515140c16f78ab17f9530d31420939b68c0a", "b00fd6bb97941d0f154bc479b110ca54a2d0cb7d" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 02:59:41 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:59:41 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed am: 7fd4bec14a\nam: b00fd6bb97\n\nChange-Id: Ie1ed5edaabe4cf6206764c0f343a70eb588009c5\n" }, { "commit": "685b515140c16f78ab17f9530d31420939b68c0a", "tree": "2a11afc6708a91bb49c2bd8f5dec6d0fade7d5a7", "parents": [ "a9e9e83964aa97d4ca2f7744ce53228e782776c4", "8621a28b04dc488763e21ecd65f24b37310b78cb" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 02:49:27 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:49:27 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5\nam: 8621a28b04\n\nChange-Id: Ifac3ab83e23f93d8f0834029b44ec8f32bbab243\n" }, { "commit": "b00fd6bb97941d0f154bc479b110ca54a2d0cb7d", "tree": "62a5e3f6fe7528059efffdcb4dd2f83b667df4e0", "parents": [ "8621a28b04dc488763e21ecd65f24b37310b78cb", "7fd4bec14aaf0e3d30eb6546ef7501d38a76d32d" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 02:48:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:48:23 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed\nam: 7fd4bec14a\n\nChange-Id: Iadf94c4dcda9ae3e7a068838de87a4fadc18be7f\n" }, { "commit": "a0624d59b5d07de166b14dedef681dead6550ddb", "tree": "4d84ab8673215fafad7b73267701208463ebc1c9", "parents": [ "98e12851336b7db16e583f9afac63ecc97465980", "da605f5a0e66419f0eb2595b21371897e5239a5e" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 19 02:41:36 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:41:36 2017 +0000" }, "message": "Revert \"Clearing up invalid entries when SyncStorageEngine starts\" am: 4a9d358448 am: 0597a93629 -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3 am: d1e7db9f4a am: 9ecbe6f6e7 am: a9e9e83964 am: f580b0f6a4 am: 2bded32359\nam: da605f5a0e\n\nChange-Id: Ifbb088171def4c9ecfc723f6aa3fd44fe3e4c091\n" }, { "commit": "8621a28b04dc488763e21ecd65f24b37310b78cb", "tree": "62a5e3f6fe7528059efffdcb4dd2f83b667df4e0", "parents": [ "9ecbe6f6e70382d6749556339297fc22e46feabc", "9950579eb5f6adcee14fc35bbc6bdee9535df3b6" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 02:37:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:37:50 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841\nam: 9950579eb5\n\nChange-Id: I9019cab591a3729592ddd142867f6b3f0c40c369\n" }, { "commit": "7fd4bec14aaf0e3d30eb6546ef7501d38a76d32d", "tree": "9ea86adf4b5f09195f56560b94f9a27db20339e7", "parents": [ "9950579eb5f6adcee14fc35bbc6bdee9535df3b6", "c6ca9254ed07ff129a4d26c5601f5ebc462ca8dd" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 02:37:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:37:19 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3\nam: c6ca9254ed\n\nChange-Id: I8715d787f890827442c098b7ef5c93c563e4246e\n" }, { "commit": "98e12851336b7db16e583f9afac63ecc97465980", "tree": "4d84ab8673215fafad7b73267701208463ebc1c9", "parents": [ "6bf609439467f101a2c7bc61bcdcc83c381a89bd", "7f9454d63d8c0e8c60f404d3b24261dc8b6104b9" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 19 02:33:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:33:18 2017 +0000" }, "message": "Revert \"Clearing up invalid entries when SyncStorageEngine starts\" am: 4a9d358448 am: 0597a93629 -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3 am: d1e7db9f4a am: 9ecbe6f6e7 am: a9e9e83964 am: f580b0f6a4 am: 2bded32359\nam: 7f9454d63d\n\nChange-Id: I4106b6b3a5ffce44afbe2fb0a515222a5fb97d69\n" }, { "commit": "9950579eb5f6adcee14fc35bbc6bdee9535df3b6", "tree": "9ea86adf4b5f09195f56560b94f9a27db20339e7", "parents": [ "d1e7db9f4a60ccb314bba69851f25b2c6be21519", "19a3c53841e321ca195510c7421a2a91f060d600" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 02:26:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:26:01 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c\nam: 19a3c53841\n\nChange-Id: I20e8fba8fe69c10c5cbdd1a1d3db27a20a206e51\n" }, { "commit": "c6ca9254ed07ff129a4d26c5601f5ebc462ca8dd", "tree": "e19bd5687deca48bb98ab968aa64afa9aed45b47", "parents": [ "19a3c53841e321ca195510c7421a2a91f060d600", "f1a95220a3653eee062f585bef9c184748213069" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 02:25:35 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:25:35 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours\nam: f1a95220a3\n\nChange-Id: Icccff07eedee53fdc20c40d62e41b40af0b4992f\n" }, { "commit": "7f9454d63d8c0e8c60f404d3b24261dc8b6104b9", "tree": "24d09af8eff4d7a6ead181faa4c48b9982e0a137", "parents": [ "beb43df98063bb11d33b4592adf7a8718f5f1821", "2bded3235929a9c4df7bc6dab013059ec8f9014c" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 19 02:16:32 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:16:32 2017 +0000" }, "message": "Revert \"Clearing up invalid entries when SyncStorageEngine starts\" am: 4a9d358448 am: 0597a93629 -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3 am: d1e7db9f4a am: 9ecbe6f6e7 am: a9e9e83964 am: f580b0f6a4\nam: 2bded32359\n\nChange-Id: I630b1db9d19f34f6f42601a36a5883e824087287\n" }, { "commit": "da605f5a0e66419f0eb2595b21371897e5239a5e", "tree": "f8ed812f59155630d900e77de35c702541d1c9cc", "parents": [ "c63c9f8ae188bbd57e72a0ba3f595600b2139d52", "2bded3235929a9c4df7bc6dab013059ec8f9014c" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 19 02:16:29 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:16:29 2017 +0000" }, "message": "Revert \"Clearing up invalid entries when SyncStorageEngine starts\" am: 4a9d358448 am: 0597a93629 -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3 am: d1e7db9f4a am: 9ecbe6f6e7 am: a9e9e83964 am: f580b0f6a4\nam: 2bded32359\n\nChange-Id: I61b5f44bbddc391303dfec7e64895d83c588f7f8\n" }, { "commit": "19a3c53841e321ca195510c7421a2a91f060d600", "tree": "e19bd5687deca48bb98ab968aa64afa9aed45b47", "parents": [ "4e61bdb7d342d97d9ad69be7deb43c7ad188eb77", "69cc90b01cd125265856b27f149200b880c7c580" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 02:12:01 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:12:01 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa\nam: 69cc90b01c\n\nChange-Id: Ia0630be45dfa4778b204585002c299c847d32366\n" }, { "commit": "f1a95220a3653eee062f585bef9c184748213069", "tree": "fbb0f18b72dc8626f8d88a887e41ad2502eebf14", "parents": [ "69cc90b01cd125265856b27f149200b880c7c580", "9b0a6a350932bef191740807101a4e107efbc888" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 02:09:14 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:09:14 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714\nam: 9b0a6a3509 -s ours\n\nChange-Id: I8a0b0468b053f31a5e28b335cfdd68d7adf7e4b5\n" }, { "commit": "9b0a6a350932bef191740807101a4e107efbc888", "tree": "656d3316792ee40ffec0069be56c9b9db221f0f0", "parents": [ "2bab19f9aaddb7851b98daaf59325b964f1e94d0", "d34366e714216ea06192d563cc9b98a03101cabd" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 02:03:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 02:03:19 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d\nam: d34366e714\n\nChange-Id: I1574e30ff64f6c7a691e8f4e1e4110cb0af9ee81\n" }, { "commit": "2bded3235929a9c4df7bc6dab013059ec8f9014c", "tree": "1a94d2393748b061aada9d5abe1fb58710874212", "parents": [ "93f47a866224426c004734b59e6bd2bed04439b6", "f580b0f6a445a5c49d3d45d93864f479fbc33249" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 19 01:59:51 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 01:59:51 2017 +0000" }, "message": "Revert \"Clearing up invalid entries when SyncStorageEngine starts\" am: 4a9d358448 am: 0597a93629 -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3 am: d1e7db9f4a am: 9ecbe6f6e7 am: a9e9e83964\nam: f580b0f6a4\n\nChange-Id: Ie647ac50b0d312df13a163005c2a7bbfd8a4a26e\n" }, { "commit": "69cc90b01cd125265856b27f149200b880c7c580", "tree": "fbb0f18b72dc8626f8d88a887e41ad2502eebf14", "parents": [ "f0d00e51ba0e786998b31e78cc410142598dde6f", "2bab19f9aaddb7851b98daaf59325b964f1e94d0" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 01:58:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 01:58:22 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006\nam: 2bab19f9aa\n\nChange-Id: I3ee3147762e5ad8d72f4478d87800a35639228e0\n" }, { "commit": "2bab19f9aaddb7851b98daaf59325b964f1e94d0", "tree": "656d3316792ee40ffec0069be56c9b9db221f0f0", "parents": [ "cf16ef09dac9c1325e219ecd3801c9bd3726b64b", "c26e04b0065b83c6f98429de90d8241cb6aee91f" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 01:49:20 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 01:49:20 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0\nam: c26e04b006\n\nChange-Id: Iade150e6e33a8ac095941e55c5871215bf54fe2d\n" }, { "commit": "d34366e714216ea06192d563cc9b98a03101cabd", "tree": "1acefac006e5f72b7be101808e673ee4018c79b6", "parents": [ "c26e04b0065b83c6f98429de90d8241cb6aee91f", "3d600ede6d64b630870d7e45df437927088eb55a" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 01:48:33 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 01:48:33 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966\nam: 3d600ede6d\n\nChange-Id: Ibc39fe483882017cbd47733259bd04eb30b187f3\n" }, { "commit": "17e973595540e8432d195ee21cba177ef0b15bb4", "tree": "95d5c0c1288d8a34ca98cdf7befacaa466d04e24", "parents": [ "169dddf8163a4ad7616cef65edcf35b031ade0cf", "edfcb00fda47a0959733e8ee52363963f68bb296" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Oct 19 01:46:44 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 19 01:46:44 2017 +0000" }, "message": "Merge \"Add config resource to specify device specific services\"" }, { "commit": "2b8a5e11dc452c11a18eaaab70b6c268d46b8ddd", "tree": "61c049e946efc87857f29879a88f0a96133fcb5d", "parents": [ "fcf52c6f5e2276c9cf2ca245757a2f0f4b1d7e4e" ], "author": { "name": "Robert Carr", "email": "racarr@google.com", "time": "Wed Oct 18 18:46:27 2017 -0700" }, "committer": { "name": "Robert Carr", "email": "racarr@google.com", "time": "Wed Oct 18 18:46:27 2017 -0700" }, "message": "Fix invisible SurfaceViews\n\nOf course OPAQUE !\u003d SURFACE_OPAQUE: that would be too easy.\n\nTest: Manual\nBug: 67896876\nChange-Id: Ic7aaae42c7de8195c474c39d850f2a07a58ccc9d\n" }, { "commit": "f580b0f6a445a5c49d3d45d93864f479fbc33249", "tree": "9519e8bb3ef2f992db905fcc6b303c5038b49f9d", "parents": [ "174d0688ccd9cf5543d96c60596ff3b5ad1df33c", "a9e9e83964aa97d4ca2f7744ce53228e782776c4" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Thu Oct 19 01:44:47 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 01:44:47 2017 +0000" }, "message": "Revert \"Clearing up invalid entries when SyncStorageEngine starts\" am: 4a9d358448 am: 0597a93629 -s ours am: d2455f8fa2 am: 2d194e5958 am: 57bbf9bb9c am: cf16ef09da am: f0d00e51ba am: 4e61bdb7d3 am: d1e7db9f4a am: 9ecbe6f6e7\nam: a9e9e83964\n\nChange-Id: I97ab1af2f24b3773cb879f13d00fb1df0177f3fc\n" }, { "commit": "c26e04b0065b83c6f98429de90d8241cb6aee91f", "tree": "1acefac006e5f72b7be101808e673ee4018c79b6", "parents": [ "57bbf9bb9c890284a352d6a1ff1bdb7ed2f552eb", "b24023a7e02f727c09114838b107544694a692b5" ], "author": { "name": "Siyamed Sinir", "email": "siyamed@google.com", "time": "Thu Oct 19 01:39:57 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 01:39:57 2017 +0000" }, "message": "Merge \"Prevent getting data from Clipboard if device is locked\" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe\nam: b24023a7e0\n\nChange-Id: If0f97db33c9f48c13c5f97c313807e8aab25a16b\n" }, { "commit": "3d600ede6d64b630870d7e45df437927088eb55a", "tree": "3778fbcb62643945273b35dd875f7105009e8745", "parents": [ "b24023a7e02f727c09114838b107544694a692b5", "01ae44596670e0c869a3fc6878d5ab9ea1b54e73" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Thu Oct 19 01:38:56 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 19 01:38:56 2017 +0000" }, "message": "Merge \"DO NOT MERGE Backporting potential usb tapjacking precaution.\" into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours\nam: 01ae445966\n\nChange-Id: Ia2dff6ee69c4c7f10413aa98ba17ca717cb492d2\n" } ], "next": "a9e9e83964aa97d4ca2f7744ce53228e782776c4" }