)]}' { "log": [ { "commit": "7e5cff01679ad79e037e0694a6290db4a1d3fcce", "tree": "fa71ff4898df17cd1a5d3eb77f1359016b3e63dd", "parents": [ "8d4fa7f6b64b8c433d08d0f4d0e617d3b79fd0c9", "966045d0702ca36df6e8c1e4597aaeb37436ca2f" ], "author": { "name": "Selim Cinek", "email": "cinek@google.com", "time": "Tue Dec 27 19:22:04 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 27 19:22:04 2016 +0000" }, "message": "DO NOT MERGE Revert \"Add Brightness setting for VR Mode.\"\nam: 966045d070\n\nChange-Id: Ib1be78a47f5947f4fcc6eabc2f6af76523690ed9\n" }, { "commit": "966045d0702ca36df6e8c1e4597aaeb37436ca2f", "tree": "3b0f267af668a9a686c53e659e3dfe1121cf3898", "parents": [ "84980c7a93e93e7134c0198212e222e11eb5ccbd" ], "author": { "name": "Selim Cinek", "email": "cinek@google.com", "time": "Tue Dec 27 11:06:35 2016 +0000" }, "committer": { "name": "Ian Pedowitz", "email": "ijpedowitz@google.com", "time": "Tue Dec 27 18:28:40 2016 +0000" }, "message": "DO NOT MERGE Revert \"Add Brightness setting for VR Mode.\"\n\nThis reverts commit 84980c7a93e93e7134c0198212e222e11eb5ccbd.\n\nBug: 33895226\nBug: 30984614\nChange-Id: I2652e77512bc870190e2172a629abac9341b2c4f\n" }, { "commit": "8d4fa7f6b64b8c433d08d0f4d0e617d3b79fd0c9", "tree": "72b7a362497f376541d22a424087c4b05a5b995f", "parents": [ "9bfda163e2b76a09d8e65899409aac9273e299e0", "a4a4cfc8f5b76328fceb830c368ddd0c8ac76b50" ], "author": { "name": "Jorim Jaggi", "email": "jjaggi@google.com", "time": "Tue Dec 27 16:37:50 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 27 16:37:50 2016 +0000" }, "message": "Merge \"Fix window transformation related issue\" am: 8760e60da5 am: 1200cfb48d\nam: a4a4cfc8f5\n\nChange-Id: Ib6a4dcb09317891decacff94340ac8b015b8db74\n" }, { "commit": "a4a4cfc8f5b76328fceb830c368ddd0c8ac76b50", "tree": "3e990883410524238ff452ed3ee0efef580c0d15", "parents": [ "715acea102b6122b675151caa0741f6919f4d075", "1200cfb48da76bd886379432e955a4d94f89460f" ], "author": { "name": "Jorim Jaggi", "email": "jjaggi@google.com", "time": "Tue Dec 27 16:32:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 27 16:32:24 2016 +0000" }, "message": "Merge \"Fix window transformation related issue\" am: 8760e60da5\nam: 1200cfb48d\n\nChange-Id: I6a105898193544119e3ca7a911faed67e46e539d\n" }, { "commit": "1200cfb48da76bd886379432e955a4d94f89460f", "tree": "4debe42e639041d2c37d20680789c52108f2ad4e", "parents": [ "6f8733190277b948610e8c841ed160b06deeba77", "8760e60da528ed0dd1a956bb13b2c9e2e76afc82" ], "author": { "name": "Jorim Jaggi", "email": "jjaggi@google.com", "time": "Tue Dec 27 16:23:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 27 16:23:49 2016 +0000" }, "message": "Merge \"Fix window transformation related issue\"\nam: 8760e60da5\n\nChange-Id: I686b637ea76402c4d4c666b60ece83755a24a5d1\n" }, { "commit": "8760e60da528ed0dd1a956bb13b2c9e2e76afc82", "tree": "54874b28dcbdd4f2db79851ecf5b2a773acd41be", "parents": [ "4ce798f45fa0d3cd35a420cd5c94f1f28f646283", "867210c1de62e533880da7ac64b8eaa837e6ed6a" ], "author": { "name": "Jorim Jaggi", "email": "jjaggi@google.com", "time": "Tue Dec 27 16:08:43 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 27 16:08:44 2016 +0000" }, "message": "Merge \"Fix window transformation related issue\"" }, { "commit": "9bfda163e2b76a09d8e65899409aac9273e299e0", "tree": "51b3e749992108dcd461b8ed142a6f2cf8c0d4c1", "parents": [ "13d418bea823ebd6ea30c0a9134c0570cc7ad271", "2f157c421a9fa15660b8f1bc0c64b1ebb45fa64a" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Dec 23 08:26:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Dec 23 08:26:29 2016 +0000" }, "message": "Don\u0027t loop forever on zero-length ICMPv6 ND options.\nam: 2f157c421a\n\nChange-Id: Id8fbe5361b8a826677638213eed565be333f2c4d\n" }, { "commit": "2f157c421a9fa15660b8f1bc0c64b1ebb45fa64a", "tree": "3edf18dc67f158ee2b5391b5102548a23c9b90a0", "parents": [ "cfdf27f24bf58c6dce0ed842b351edc032511a7c" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Dec 23 13:54:50 2016 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Dec 23 13:54:50 2016 +0900" }, "message": "Don\u0027t loop forever on zero-length ICMPv6 ND options.\n\nBug: 33828433\nChange-Id: Ie1905167126c8c8f3896eaa5e36cd006ca354e99\n" }, { "commit": "13d418bea823ebd6ea30c0a9134c0570cc7ad271", "tree": "246c49c85bd9a1429110b1d108de4120807f952d", "parents": [ "84334e25cd96916b5497a584748d0dc8e8968280", "cfdf27f24bf58c6dce0ed842b351edc032511a7c" ], "author": { "name": "Santos Cordon", "email": "santoscordon@google.com", "time": "Thu Dec 22 23:58:15 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 23:58:15 2016 +0000" }, "message": "Merge \"Add Brightness setting for VR Mode.\" into nyc-mr2-dev\nam: cfdf27f24b\n\nChange-Id: I1edc922f659f83f36102a3e6d3e36e2a6f74716f\n" }, { "commit": "84334e25cd96916b5497a584748d0dc8e8968280", "tree": "246c49c85bd9a1429110b1d108de4120807f952d", "parents": [ "dfee8e5f2d7b4bce4d2d3cd85e8a4505b321747f", "84980c7a93e93e7134c0198212e222e11eb5ccbd" ], "author": { "name": "Santos Cordon", "email": "santoscordon@google.com", "time": "Thu Dec 22 23:58:05 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 23:58:05 2016 +0000" }, "message": "Add Brightness setting for VR Mode.\nam: 84980c7a93\n\nChange-Id: I4a9c3db7bdf73e673cf8b2409404339df94086c2\n" }, { "commit": "cfdf27f24bf58c6dce0ed842b351edc032511a7c", "tree": "8cdc81daa760a45f092737f0c8275f49e64b8c7d", "parents": [ "dfe1bc2f343bf404637af05b9e7b5bbb7c733270", "84980c7a93e93e7134c0198212e222e11eb5ccbd" ], "author": { "name": "Santos Cordon", "email": "santoscordon@google.com", "time": "Thu Dec 22 23:49:16 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 22 23:49:20 2016 +0000" }, "message": "Merge \"Add Brightness setting for VR Mode.\" into nyc-mr2-dev" }, { "commit": "84980c7a93e93e7134c0198212e222e11eb5ccbd", "tree": "61a934ed1df5a2ec2b91feace0fcacbeb76cdbcf", "parents": [ "4869a55f66451222579ffe9d15d829a86a401f09" ], "author": { "name": "Santos Cordon", "email": "santoscordon@google.com", "time": "Tue Sep 20 15:50:35 2016 -0700" }, "committer": { "name": "Santos Cordon", "email": "santoscordon@google.com", "time": "Thu Dec 22 23:26:49 2016 +0000" }, "message": "Add Brightness setting for VR Mode.\n\nThis change saves and loads a different brightness setting when the user\ngoes in and out of VR Mode.\n\nBug: 30984614\nMerged-In: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93\nChange-Id: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93\n" }, { "commit": "dfee8e5f2d7b4bce4d2d3cd85e8a4505b321747f", "tree": "71c7d262d0b4b4a539a7aa2ec7abd34389b9a74a", "parents": [ "d3d5cb464593b4950dfb1007d7644aecbf405768", "715acea102b6122b675151caa0741f6919f4d075" ], "author": { "name": "Joe LaPenna", "email": "jlapenna@google.com", "time": "Thu Dec 22 21:51:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 21:51:57 2016 +0000" }, "message": "Merge \"Add simplified_network_settings_bool to CarrierConfig.\" am: 4ce798f45f am: 6f87331902\nam: 715acea102\n\nChange-Id: I44bc0113697be113ef79ac9a904485b49bed2f87\n" }, { "commit": "715acea102b6122b675151caa0741f6919f4d075", "tree": "87363c8a3934ebed88841d76fec40c166b9ae931", "parents": [ "5e1efa2cc739711d3e448b6a5fc3563f3199078a", "6f8733190277b948610e8c841ed160b06deeba77" ], "author": { "name": "Joe LaPenna", "email": "jlapenna@google.com", "time": "Thu Dec 22 21:47:00 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 21:47:00 2016 +0000" }, "message": "Merge \"Add simplified_network_settings_bool to CarrierConfig.\" am: 4ce798f45f\nam: 6f87331902\n\nChange-Id: I3681893e43949060922f72c65f8f106090005d14\n" }, { "commit": "6f8733190277b948610e8c841ed160b06deeba77", "tree": "a7635a14549fa5c8d6ef846527be0e717aaf94a0", "parents": [ "b6022b9fa0cc0c0f8370183aa9e88cda1de497e9", "4ce798f45fa0d3cd35a420cd5c94f1f28f646283" ], "author": { "name": "Joe LaPenna", "email": "jlapenna@google.com", "time": "Thu Dec 22 21:41:23 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 21:41:23 2016 +0000" }, "message": "Merge \"Add simplified_network_settings_bool to CarrierConfig.\"\nam: 4ce798f45f\n\nChange-Id: I7343422cd3405628d6c2b90092af631b77eb37a7\n" }, { "commit": "4ce798f45fa0d3cd35a420cd5c94f1f28f646283", "tree": "ffc21b9500799a24df4dff260a81a3dd4bcaad7a", "parents": [ "380697ca7999ba22996282674ab180d16cc1b409", "5e0164e16c0b7fd5bf104bb6648f954910a9ef7d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 22 21:29:56 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 22 21:29:56 2016 +0000" }, "message": "Merge \"Add simplified_network_settings_bool to CarrierConfig.\"" }, { "commit": "d3d5cb464593b4950dfb1007d7644aecbf405768", "tree": "34a6d2187a77cc0cf3ebd3e2c6911386d79469e2", "parents": [ "70eb66a904ee55a20049004c1ba550efc68ed4b8" ], "author": { "name": "pkanwar", "email": "pkanwar@google.com", "time": "Thu Dec 22 13:16:53 2016 -0800" }, "committer": { "name": "pkanwar", "email": "pkanwar@google.com", "time": "Thu Dec 22 13:16:53 2016 -0800" }, "message": "Revert \"DO NOT MERGE: Add API to indicate carrier networks.\"\n\nThese changes are not applicable for aosp and will be implemented in\nmaster.\n\nThis reverts commit 9f47a5d85eca1f93833b328dea3d31fc36d79591.\n\nBug: 31003437\n" }, { "commit": "70eb66a904ee55a20049004c1ba550efc68ed4b8", "tree": "ce2d6421bd632c528ee09b77811226f7b14ae125", "parents": [ "e76b9dcb62edc1ffa8c9e38b4466515ceef43e18", "dfe1bc2f343bf404637af05b9e7b5bbb7c733270" ], "author": { "name": "Daniel Nishi", "email": "dhnishi@google.com", "time": "Thu Dec 22 21:10:00 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 21:10:00 2016 +0000" }, "message": "Merge \"Fix a bug where the package stats query timeout may crash.\" into nyc-mr2-dev\nam: dfe1bc2f34\n\nChange-Id: I1c06fad6316f3cc34b917cbbf359d838e01d650e\n" }, { "commit": "e76b9dcb62edc1ffa8c9e38b4466515ceef43e18", "tree": "ce2d6421bd632c528ee09b77811226f7b14ae125", "parents": [ "8b775f96b9960236c48559e3d2ab5dfd4f69e144", "cf76a16e660a361670745b043198b797ccd86747" ], "author": { "name": "Daniel Nishi", "email": "dhnishi@google.com", "time": "Thu Dec 22 21:09:53 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 21:09:53 2016 +0000" }, "message": "Fix a bug where the package stats query timeout may crash.\nam: cf76a16e66\n\nChange-Id: Ibc146f89412387eb05a164c2a1969210fcea4262\n" }, { "commit": "dfe1bc2f343bf404637af05b9e7b5bbb7c733270", "tree": "51fc4aa24441dada87c34769a06cd3f3a5b0e9de", "parents": [ "f6d8e1f635a190ede658c9beb86f7a2fe616c741", "cf76a16e660a361670745b043198b797ccd86747" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 22 21:03:00 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 22 21:03:04 2016 +0000" }, "message": "Merge \"Fix a bug where the package stats query timeout may crash.\" into nyc-mr2-dev" }, { "commit": "8b775f96b9960236c48559e3d2ab5dfd4f69e144", "tree": "d9676e3fd623658bdad9890ebf1359912f3533f4", "parents": [ "55a0803234fde0e076484d673b78cd3eadc48128", "5e1efa2cc739711d3e448b6a5fc3563f3199078a" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Dec 22 20:58:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 20:58:54 2016 +0000" }, "message": "Merge \"HwBinder: fail gracefully for device w/o hwbinder\" am: 380697ca79 am: b6022b9fa0\nam: 5e1efa2cc7\n\nChange-Id: I190fab7adf1222c71d6d5d71ab8cbe2928600a34\n" }, { "commit": "55a0803234fde0e076484d673b78cd3eadc48128", "tree": "ff5ca57017b6116213c0071f30dacbbea7f828a6", "parents": [ "21f8870abc5aae673fc4d2ae683151b84f430b21", "f6d8e1f635a190ede658c9beb86f7a2fe616c741" ], "author": { "name": "Pankaj Kanwar", "email": "pkanwar@google.com", "time": "Thu Dec 22 20:54:11 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 20:54:11 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Add UI toggle to control connections to carrier networks.\" into nyc-mr2-dev\nam: f6d8e1f635\n\nChange-Id: I1412b56245583d65f382613fd466ede1efaa298f\n" }, { "commit": "21f8870abc5aae673fc4d2ae683151b84f430b21", "tree": "ff5ca57017b6116213c0071f30dacbbea7f828a6", "parents": [ "b53d98413261c22e26d5bde635ac52012b78b8cf", "57f383709b765e531f9bf7f521d93d2a2fee9f4a" ], "author": { "name": "pkanwar", "email": "pkanwar@google.com", "time": "Thu Dec 22 20:53:58 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 20:53:58 2016 +0000" }, "message": "DO NOT MERGE: Add UI toggle to control connections to carrier networks.\nam: 57f383709b\n\nChange-Id: Ieb3aa3a0755bcd16759d91852980bcdf5373eaa8\n" }, { "commit": "5e1efa2cc739711d3e448b6a5fc3563f3199078a", "tree": "fbe6862f7f4ced979b3a3b0856b47f8670ffabbf", "parents": [ "8e23aa4ee6ca559fc51e519225193841fce37318", "b6022b9fa0cc0c0f8370183aa9e88cda1de497e9" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Dec 22 20:53:52 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 20:53:52 2016 +0000" }, "message": "Merge \"HwBinder: fail gracefully for device w/o hwbinder\" am: 380697ca79\nam: b6022b9fa0\n\nChange-Id: I7135d790ed299f21975c5b27b534714d83ccf440\n" }, { "commit": "b6022b9fa0cc0c0f8370183aa9e88cda1de497e9", "tree": "dd6062859701915ce860e51a556ecfc4ca3e4b8b", "parents": [ "e988e8f1f680e7820bf3c9dcf59fe7a64493d581", "380697ca7999ba22996282674ab180d16cc1b409" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Dec 22 20:48:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 20:48:17 2016 +0000" }, "message": "Merge \"HwBinder: fail gracefully for device w/o hwbinder\"\nam: 380697ca79\n\nChange-Id: I301b1f9e9344a8b314a6debff3fef2e7c8362f1a\n" }, { "commit": "f6d8e1f635a190ede658c9beb86f7a2fe616c741", "tree": "bc67fd5aff238bc8a5e99eebc7d8ef4f6325ccd3", "parents": [ "1cc8a2a617cbfff23c28efccf19e8e4a3df1a450", "57f383709b765e531f9bf7f521d93d2a2fee9f4a" ], "author": { "name": "Pankaj Kanwar", "email": "pkanwar@google.com", "time": "Thu Dec 22 20:41:54 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 22 20:41:58 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Add UI toggle to control connections to carrier networks.\" into nyc-mr2-dev" }, { "commit": "380697ca7999ba22996282674ab180d16cc1b409", "tree": "c0fe5bb1e6633b5b12994fd17b5cf778be4d551e", "parents": [ "933ea68aca684719f482721f301b014df2a14714", "520d12c53cb456f8722a2e8e3bc6d6485f5647e1" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 22 20:41:01 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 22 20:41:01 2016 +0000" }, "message": "Merge \"HwBinder: fail gracefully for device w/o hwbinder\"" }, { "commit": "5e0164e16c0b7fd5bf104bb6648f954910a9ef7d", "tree": "b898686ccbade4bb0dba10533bb83dfa6e7241e9", "parents": [ "933ea68aca684719f482721f301b014df2a14714" ], "author": { "name": "Joe LaPenna", "email": "jlapenna@google.com", "time": "Wed Dec 21 20:17:08 2016 -0800" }, "committer": { "name": "Joe LaPenna", "email": "jlapenna@google.com", "time": "Thu Dec 22 11:53:10 2016 -0800" }, "message": "Add simplified_network_settings_bool to CarrierConfig.\n\nSome carriers want to further simplify network settings based on a\nvariety of wifi or cellular related bundles. Expose a config a\ncarrier might set to allow SysUi, Settings and platform to adjust.\n\nBUG: 33111931\nTest: runtest carrierconfig-unit\nChange-Id: I35a7ef15bbba23cf9e0380432fc001804c7e1804\nMerged-In: I35a7ef15bbba23cf9e0380432fc001804c7e1804\n" }, { "commit": "b53d98413261c22e26d5bde635ac52012b78b8cf", "tree": "bb6dbabe3c08b7abe091d4c78ff108c01bb98b10", "parents": [ "f44bea51fb5c408fdeb295f82d0e8528fbf03f38", "8e23aa4ee6ca559fc51e519225193841fce37318" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Thu Dec 22 19:32:47 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:32:47 2016 +0000" }, "message": "Merge \"Make users of MtpServer fill in DeviceInfo field values\" am: 933ea68aca am: e988e8f1f6\nam: 8e23aa4ee6\n\nChange-Id: I13926b884509c4018d8ced24a80acc3e8c2b5d7a\n" }, { "commit": "cf76a16e660a361670745b043198b797ccd86747", "tree": "48871860c02a0cb43faf49fa59dc5b47b0e5f6aa", "parents": [ "683dbf1fc6d28ba5008779627bf4faf8cd14106c" ], "author": { "name": "Daniel Nishi", "email": "dhnishi@google.com", "time": "Thu Dec 22 11:06:51 2016 -0800" }, "committer": { "name": "Daniel Nishi", "email": "dhnishi@google.com", "time": "Thu Dec 22 11:32:33 2016 -0800" }, "message": "Fix a bug where the package stats query timeout may crash.\n\nThis adds a null-check to verify that we got real data before\ntrying to use it and increases the timeout time to reduce the\nlikelihood of timing out.\n\nTest: FrameworkServicesTests\nBug: 33836034\nChange-Id: Ia1ad4aba05c5c4fb8688fc9fc94df344f736e396\n" }, { "commit": "f44bea51fb5c408fdeb295f82d0e8528fbf03f38", "tree": "4bbf027d9a1c48ae8c8720467f4ba9cc7472a436", "parents": [ "4ac2f9f53edf502117af9c01ccc103cac752ba2b", "43e86c1ca6b6855df83d0ebe3848310648f0624a" ], "author": { "name": "Sundeep Ghuman", "email": "sghuman@google.com", "time": "Thu Dec 22 19:27:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:27:29 2016 +0000" }, "message": "Merge \"Fix failing WifiNetworkScoreCacheTest.\" am: 5e055b6a18 am: 80f1e2e52a\nam: 43e86c1ca6\n\nChange-Id: If7acfafd1cb8e52b778cf8fb347e1a0d509d7f62\n" }, { "commit": "4ac2f9f53edf502117af9c01ccc103cac752ba2b", "tree": "9f06e85ac2f2fb60659451dc97c8f0230426c6e4", "parents": [ "10524f61f51b22d0742ce52422d5e4b08fea3339", "bfc0bfe6450eafb4083c4d19dfe1a314da45568f" ], "author": { "name": "Sundeep Ghuman", "email": "sghuman@google.com", "time": "Thu Dec 22 19:26:05 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:26:05 2016 +0000" }, "message": "Merge \"Cherrypick: Define the calculateRankingScore method and Key.\" am: 425af45d02 am: 41577a0029\nam: bfc0bfe645\n\nChange-Id: Ia3d455791e3f219a3e0cff3b6946184757487d71\n" }, { "commit": "10524f61f51b22d0742ce52422d5e4b08fea3339", "tree": "0d0a3667d98fa423d170ba1997b9b252ba343ab1", "parents": [ "7d26ab59cddabd6101691739574227e6f052d439", "deddce7ff623e1fe094ffaad646f6b1a0953c0e8" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Dec 22 19:24:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:24:17 2016 +0000" }, "message": "Merge changes I40f055df,I562713df am: 4a04c07df4 am: 8eff13b521\nam: deddce7ff6\n\nChange-Id: I0026c9b1fed0e8eeab95a1d0c03f8235c7643c62\n" }, { "commit": "8e23aa4ee6ca559fc51e519225193841fce37318", "tree": "ded8b7f1a55f967184c5ae813dfa1b240b9adfd4", "parents": [ "43e86c1ca6b6855df83d0ebe3848310648f0624a", "e988e8f1f680e7820bf3c9dcf59fe7a64493d581" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Thu Dec 22 19:22:46 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:22:46 2016 +0000" }, "message": "Merge \"Make users of MtpServer fill in DeviceInfo field values\" am: 933ea68aca\nam: e988e8f1f6\n\nChange-Id: Icce6e31723d4dac12cf2c2e389e69c067dd66a91\n" }, { "commit": "7d26ab59cddabd6101691739574227e6f052d439", "tree": "0d0a3667d98fa423d170ba1997b9b252ba343ab1", "parents": [ "7af07643f3df25dc01de533833ed25082d87f5f0", "268176317b087cb7acf5fbf859d37006308bf023" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Dec 22 19:22:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:22:44 2016 +0000" }, "message": "Stay bound to the most current active scorer. am: b1365852cc am: d79019a616\nam: 268176317b\n\nChange-Id: I3fcfd02759c9748b4e00a5e825b670259c0d0263\n" }, { "commit": "7af07643f3df25dc01de533833ed25082d87f5f0", "tree": "8866f4968946086a3fc07cf346aa345621a148ae", "parents": [ "a9888fc0c42d643e29e80bd0f2394d87f3339f44", "3f32d12be0d3acb4bd0c01aaa6df39c1a583ce88" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Dec 22 19:21:45 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:21:45 2016 +0000" }, "message": "Clear and restore the calling ID. am: 29ed4a99bf am: 3588b8d44c\nam: 3f32d12be0\n\nChange-Id: I2cbf3ca1ff0a743de1b08fad467027ec59333def\n" }, { "commit": "43e86c1ca6b6855df83d0ebe3848310648f0624a", "tree": "ed8bd7fe6c78b330e6fb89879f699bc298818865", "parents": [ "bfc0bfe6450eafb4083c4d19dfe1a314da45568f", "80f1e2e52a8aa38f2693c46bae8636278a88d46e" ], "author": { "name": "Sundeep Ghuman", "email": "sghuman@google.com", "time": "Thu Dec 22 19:16:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:16:13 2016 +0000" }, "message": "Merge \"Fix failing WifiNetworkScoreCacheTest.\" am: 5e055b6a18\nam: 80f1e2e52a\n\nChange-Id: I08fe2e52a4926dc3d2fae02bf90c3fcf5b60ee82\n" }, { "commit": "bfc0bfe6450eafb4083c4d19dfe1a314da45568f", "tree": "1d269c7674a64418f4971bb1fc80bc8e0158a72c", "parents": [ "deddce7ff623e1fe094ffaad646f6b1a0953c0e8", "41577a00292d0ca0e6eb451c564a51ea13d007ae" ], "author": { "name": "Sundeep Ghuman", "email": "sghuman@google.com", "time": "Thu Dec 22 19:14:48 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:14:48 2016 +0000" }, "message": "Merge \"Cherrypick: Define the calculateRankingScore method and Key.\" am: 425af45d02\nam: 41577a0029\n\nChange-Id: I7807d92a705a8ec9d9c7b04159e1cd2290846e38\n" }, { "commit": "deddce7ff623e1fe094ffaad646f6b1a0953c0e8", "tree": "1a68a1d99f01d3487d0685b756a3699331dd79c8", "parents": [ "268176317b087cb7acf5fbf859d37006308bf023", "8eff13b521f6ba3bc8f0c3f095fa1565a3c819f7" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Dec 22 19:12:47 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:12:47 2016 +0000" }, "message": "Merge changes I40f055df,I562713df am: 4a04c07df4\nam: 8eff13b521\n\nChange-Id: I758eaa79b9707073fcfea1454e59c48c58a80e4d\n" }, { "commit": "57f383709b765e531f9bf7f521d93d2a2fee9f4a", "tree": "7df1703776fd3abb8c29c2405ab40c26f05c2834", "parents": [ "9f47a5d85eca1f93833b328dea3d31fc36d79591" ], "author": { "name": "pkanwar", "email": "pkanwar@google.com", "time": "Thu Dec 22 11:12:02 2016 -0800" }, "committer": { "name": "pkanwar", "email": "pkanwar@google.com", "time": "Thu Dec 22 11:12:02 2016 -0800" }, "message": "DO NOT MERGE: Add UI toggle to control connections to carrier networks.\n\nBug: 31003437\nChange-Id: I6cf32ae4d376eb65f80492da0922dbecb762c9da\n" }, { "commit": "268176317b087cb7acf5fbf859d37006308bf023", "tree": "1a68a1d99f01d3487d0685b756a3699331dd79c8", "parents": [ "3f32d12be0d3acb4bd0c01aaa6df39c1a583ce88", "d79019a61617b1f677a8b4ceb0b5369d2d73aeee" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Dec 22 19:11:48 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:11:48 2016 +0000" }, "message": "Stay bound to the most current active scorer. am: b1365852cc\nam: d79019a616\n\nChange-Id: Ib3c7a4cdaea80ad4ac84c6baa92d879396c0f483\n" }, { "commit": "3f32d12be0d3acb4bd0c01aaa6df39c1a583ce88", "tree": "8056f15f0055a595c7dd7885f766988706678fdb", "parents": [ "b82465849450a54820758161fefe05cf61ea960f", "3588b8d44c8dce4d7ca8a2346e148c9bd3c964df" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Dec 22 19:10:46 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:10:46 2016 +0000" }, "message": "Clear and restore the calling ID. am: 29ed4a99bf\nam: 3588b8d44c\n\nChange-Id: I43b6f2899b5d82d4781937766907d6d7afa6b2bd\n" }, { "commit": "e988e8f1f680e7820bf3c9dcf59fe7a64493d581", "tree": "b4fd34e85da3a8250ceba6d5466219ef614d04d8", "parents": [ "80f1e2e52a8aa38f2693c46bae8636278a88d46e", "933ea68aca684719f482721f301b014df2a14714" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Thu Dec 22 19:10:00 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:10:00 2016 +0000" }, "message": "Merge \"Make users of MtpServer fill in DeviceInfo field values\"\nam: 933ea68aca\n\nChange-Id: Iacecf43819f8cd6c0e8df7a53105e0538075c188\n" }, { "commit": "a9888fc0c42d643e29e80bd0f2394d87f3339f44", "tree": "1d6150e766c8bb471d5bb0df2f26b7fc380988d0", "parents": [ "52c35fb3a85ba5431c0dbc18bc8d7a334426c2d5", "b82465849450a54820758161fefe05cf61ea960f" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Thu Dec 22 19:06:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:06:09 2016 +0000" }, "message": "resolve merge conflicts of febd982 to stage-aosp-master am: 5c53fdb893\nam: b824658494\n\nChange-Id: Ic1dd2aef96889f0f68a55093cfb04b4d90f34818\n" }, { "commit": "80f1e2e52a8aa38f2693c46bae8636278a88d46e", "tree": "c5178ea763d54ad0b2411f9e5659af786a4b88a9", "parents": [ "41577a00292d0ca0e6eb451c564a51ea13d007ae", "5e055b6a18201eb5e830a94d24d639941683a92e" ], "author": { "name": "Sundeep Ghuman", "email": "sghuman@google.com", "time": "Thu Dec 22 19:05:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:05:44 2016 +0000" }, "message": "Merge \"Fix failing WifiNetworkScoreCacheTest.\"\nam: 5e055b6a18\n\nChange-Id: I52e23144730acc15c943fa6485a872a88ee0a787\n" }, { "commit": "41577a00292d0ca0e6eb451c564a51ea13d007ae", "tree": "e173698748dd503654a8218ccf77388bdd44f4cb", "parents": [ "8eff13b521f6ba3bc8f0c3f095fa1565a3c819f7", "425af45d0224e880380539882b1de425c5afe72c" ], "author": { "name": "Sundeep Ghuman", "email": "sghuman@google.com", "time": "Thu Dec 22 19:04:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:04:22 2016 +0000" }, "message": "Merge \"Cherrypick: Define the calculateRankingScore method and Key.\"\nam: 425af45d02\n\nChange-Id: Ib61f91087967f1b026cd2ba77175ccf47943bc53\n" }, { "commit": "8eff13b521f6ba3bc8f0c3f095fa1565a3c819f7", "tree": "8fd5c0b8879f1c15e4464034fe4f3c9046538531", "parents": [ "d79019a61617b1f677a8b4ceb0b5369d2d73aeee", "4a04c07df403376f325f168bbc1031307193a325" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Dec 22 19:02:45 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:02:45 2016 +0000" }, "message": "Merge changes I40f055df,I562713df\nam: 4a04c07df4\n\nChange-Id: Ie951518a0a472691d1cd8b90a025e3a67b1acd53\n" }, { "commit": "d79019a61617b1f677a8b4ceb0b5369d2d73aeee", "tree": "8fd5c0b8879f1c15e4464034fe4f3c9046538531", "parents": [ "3588b8d44c8dce4d7ca8a2346e148c9bd3c964df", "b1365852cccc0d15bd2b278b929f952e75417f2d" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Dec 22 19:02:38 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:02:38 2016 +0000" }, "message": "Stay bound to the most current active scorer.\nam: b1365852cc\n\nChange-Id: I8313d23450b47f23f73eb050e6b4244bc0d37622\n" }, { "commit": "3588b8d44c8dce4d7ca8a2346e148c9bd3c964df", "tree": "47aa8f46823f6aebf8d9a9d29d9c05bcd2a6551c", "parents": [ "5c53fdb89367481c2a65d7c8d188415c8e485131", "29ed4a99bf3fae207f2359de34d3b37edf15e3dc" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Thu Dec 22 19:01:43 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:01:43 2016 +0000" }, "message": "Clear and restore the calling ID.\nam: 29ed4a99bf\n\nChange-Id: Ie5752ca772e6f5c8fed8092d23e0604f44598b24\n" }, { "commit": "b82465849450a54820758161fefe05cf61ea960f", "tree": "ad71b3858ffc86341b71a35ffdfc517105e00da0", "parents": [ "8dc64b729b3005660c06006a1f60b873d5181ccd", "5c53fdb89367481c2a65d7c8d188415c8e485131" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Thu Dec 22 19:01:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 19:01:13 2016 +0000" }, "message": "resolve merge conflicts of febd982 to stage-aosp-master\nam: 5c53fdb893\n\nChange-Id: Ib0878f0f17c3799ff9ffb92d7e85904fc91fdab7\n" }, { "commit": "5c53fdb89367481c2a65d7c8d188415c8e485131", "tree": "fc8a404cf10efd5998b58dd0d0e47b06b0fe2954", "parents": [ "a3943850ab67dc2df1639202de6735c3991e4dc8", "febd982cdd61ecad34c4d463fb63d2a4836d26ea" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Thu Dec 22 10:20:23 2016 -0800" }, "committer": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Thu Dec 22 10:20:23 2016 -0800" }, "message": "resolve merge conflicts of febd982 to stage-aosp-master\n\nChange-Id: I40c27e3159b8f7acd60c6fa42509bb23d146b937\n" }, { "commit": "52c35fb3a85ba5431c0dbc18bc8d7a334426c2d5", "tree": "c3e1930da5a56350598367c40aa9801239821da2", "parents": [ "a72e75213f329ea78db8afeef9bbcb5cd62a3925", "b14ae0e335ff164b486de83be634f0ba2c2a949e" ], "author": { "name": "Android Build Merger (Role)", "email": "android-build-merger@google.com", "time": "Thu Dec 22 18:15:30 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 22 18:15:34 2016 +0000" }, "message": "Merge \"Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f am: 2da05d0f9e am: 3b7d90c024 am: f035e8b411 am: 1cc8a2a617\" into nyc-mr2-dev-plus-aosp" }, { "commit": "b14ae0e335ff164b486de83be634f0ba2c2a949e", "tree": "c3e1930da5a56350598367c40aa9801239821da2", "parents": [ "b4aa5f6e13801031ac1974374773c76702e249cb", "1cc8a2a617cbfff23c28efccf19e8e4a3df1a450" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 18:14:47 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 18:14:47 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f am: 2da05d0f9e am: 3b7d90c024 am: f035e8b411\nam: 1cc8a2a617\n\nChange-Id: I6f4da4dfbadd0b484019b918dff8b161cec2c1ed\n" }, { "commit": "a72e75213f329ea78db8afeef9bbcb5cd62a3925", "tree": "c3e1930da5a56350598367c40aa9801239821da2", "parents": [ "b4aa5f6e13801031ac1974374773c76702e249cb", "8dc64b729b3005660c06006a1f60b873d5181ccd" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 18:14:42 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 18:14:42 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f am: 2da05d0f9e am: 3b7d90c024 am: f035e8b411\nam: 8dc64b729b\n\nChange-Id: I1b83d758c57b21c574de55e4de3a80283d9b7f56\n" }, { "commit": "8dc64b729b3005660c06006a1f60b873d5181ccd", "tree": "3032fe34b0ee89be09b0746214c3637e8d2ff51c", "parents": [ "471093b58e97ab2ea310c7743acb7674a07f7391", "f035e8b41106edda0a154dc5901b799625b02e5b" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 18:09:50 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 18:09:50 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f am: 2da05d0f9e am: 3b7d90c024\nam: f035e8b411\n\nChange-Id: I6a73e11687db11cd0d6814999e955c20fe7b8ad5\n" }, { "commit": "1cc8a2a617cbfff23c28efccf19e8e4a3df1a450", "tree": "96d74137d2b812fbad15eff74ac7f7a7f5f90926", "parents": [ "683dbf1fc6d28ba5008779627bf4faf8cd14106c", "f035e8b41106edda0a154dc5901b799625b02e5b" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 18:09:48 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 18:09:48 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f am: 2da05d0f9e am: 3b7d90c024\nam: f035e8b411\n\nChange-Id: I0795fffc9f7f79f14038cfb6386bbe308b879db5\n" }, { "commit": "b4aa5f6e13801031ac1974374773c76702e249cb", "tree": "d21544c4e2adbe321282897efc883fc6318a3398", "parents": [ "aa4d204be7539785bd6609d0ba09c0613e659b14", "683dbf1fc6d28ba5008779627bf4faf8cd14106c" ], "author": { "name": "Pankaj Kanwar", "email": "pkanwar@google.com", "time": "Thu Dec 22 18:04:47 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 18:04:47 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Add API to indicate carrier networks.\" into nyc-mr2-dev\nam: 683dbf1fc6\n\nChange-Id: If1e5f0f82e18608990500d41211a49e9acbef51f\n" }, { "commit": "f035e8b41106edda0a154dc5901b799625b02e5b", "tree": "f19ea1100b20e666e54b3a83ef1aa18b63a72933", "parents": [ "70fa908fb208a4fd00da945aa315f31a1c932192", "3b7d90c024126b9728c0f73e01e4867a188ec64b" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 18:04:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 18:04:44 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f am: 2da05d0f9e\nam: 3b7d90c024\n\nChange-Id: I46c1bf565b04175c8c97c9faeceed55bda41dbde\n" }, { "commit": "aa4d204be7539785bd6609d0ba09c0613e659b14", "tree": "d21544c4e2adbe321282897efc883fc6318a3398", "parents": [ "709844aed410c2ed566c6e272411e99b175dcd2c", "9f47a5d85eca1f93833b328dea3d31fc36d79591" ], "author": { "name": "pkanwar", "email": "pkanwar@google.com", "time": "Thu Dec 22 18:04:42 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 18:04:42 2016 +0000" }, "message": "DO NOT MERGE: Add API to indicate carrier networks.\nam: 9f47a5d85e\n\nChange-Id: Ib0ed3283a55ec285cafa1f120a8545956e27c242\n" }, { "commit": "3b7d90c024126b9728c0f73e01e4867a188ec64b", "tree": "bb30c34b0580e43ba3367e1951548b0bac0d4a51", "parents": [ "cbfb58c9d7fd317d48febeee1308247c79287332", "2da05d0f9eb442a6dd323595b8b9be6dcd1b5330" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:59:47 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:59:47 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f\nam: 2da05d0f9e\n\nChange-Id: I8c94a06f5fa722312436484609bafcb0585d6d18\n" }, { "commit": "683dbf1fc6d28ba5008779627bf4faf8cd14106c", "tree": "e6f46949266eec34d02659f5c84af35c170d56e6", "parents": [ "1fc63da0e5effdb614fa7728fc25c2bb43641f19", "9f47a5d85eca1f93833b328dea3d31fc36d79591" ], "author": { "name": "Pankaj Kanwar", "email": "pkanwar@google.com", "time": "Thu Dec 22 17:59:08 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 22 17:59:12 2016 +0000" }, "message": "Merge \"DO NOT MERGE: Add API to indicate carrier networks.\" into nyc-mr2-dev" }, { "commit": "2da05d0f9eb442a6dd323595b8b9be6dcd1b5330", "tree": "e0f6c255e4785afeab9ced6bba2352545d6a1994", "parents": [ "045ae0458a586b8006799b9ec7398115c8ff3bea", "7cec76de0fed67bff9feace9ff44e337744cb64b" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:54:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:54:44 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6\nam: 7cec76de0f\n\nChange-Id: I9168d45717c26e71bb356dd7304276e23c519bd9\n" }, { "commit": "7cec76de0fed67bff9feace9ff44e337744cb64b", "tree": "ab181f9ab2a29989a3a530fc82102d2079dc8a4b", "parents": [ "b9bd6cca9e806010377860fd3ec89f66667b6f58", "56098f81b604df1d74501596f043cc11daed8924" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:44:46 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:44:46 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51\nam: 56098f81b6\n\nChange-Id: I14fcacaede569580c8ca8e5bbbebb408ddcce76a\n" }, { "commit": "56098f81b604df1d74501596f043cc11daed8924", "tree": "18e437730c1d629fe10ce9d6bb2632961a50b5fe", "parents": [ "7a69e8f3d8194adb87842fcd43de99ee02f5931d", "1ac8affd5134a263913979f6daf6fffc03333284" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:39:18 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:39:18 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc\nam: 1ac8affd51\n\nChange-Id: I965c900e266a9189c595612cef6ddac839498949\n" }, { "commit": "1ac8affd5134a263913979f6daf6fffc03333284", "tree": "8decf2805a105f0a6b7eadb52360242cea42726e", "parents": [ "e6f8cb29ec349b7406050914c1b128d33112ca69", "d82f8a67fc453953a89ed2cd4c783a85cc9b3547" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:34:11 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:34:11 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66\nam: d82f8a67fc\n\nChange-Id: I25e43680e464c5169e8a5b9e8151b0dab2d2cf86\n" }, { "commit": "d82f8a67fc453953a89ed2cd4c783a85cc9b3547", "tree": "6d4c14f801ec06b675112e0fcc1ca648626dd4cc", "parents": [ "37ff2d56bf87d552a0842096e507aefd6b0d4983", "1f458fdc66c27977a2f93ba473d120aad190282a" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:29:05 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:29:05 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2\nam: 1f458fdc66\n\nChange-Id: I61d4b25ee0264397693f30e2091997c058d0c5fc\n" }, { "commit": "1f458fdc66c27977a2f93ba473d120aad190282a", "tree": "c86a5c3bab5c8fffa00961f0a7b27438c038cb61", "parents": [ "aff9286bd6c073d06d36cb271445323afb7cb04f", "d28eef0cc2b5cc8b01f3e36a883bfaa529ec0cfd" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:23:39 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:23:39 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344\nam: d28eef0cc2\n\nChange-Id: If937d91cee2bb06406cf3cd1ae6ac3402a51e88d\n" }, { "commit": "d28eef0cc2b5cc8b01f3e36a883bfaa529ec0cfd", "tree": "c63bc7a72260b15fb4ca7403834fd633f666adcf", "parents": [ "920b02a94fb7e9ecd7f07fa96370e1858b7c85c7", "1684e5f344e385a88c5f672619c4aeaed9417957" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:19:10 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:19:10 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b\nam: 1684e5f344\n\nChange-Id: I0ebd2856e2e2f3793273ba952b44dc77e85b021e\n" }, { "commit": "1684e5f344e385a88c5f672619c4aeaed9417957", "tree": "95122b2deb72d74d80cd68e2db2f56938e8122ad", "parents": [ "ce477912a2c8c6945e72be79973f1c4157fed915", "0a8978f04b4cc2e273545568b424756ee5a40a3d" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:14:05 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:14:05 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516\nam: 0a8978f04b\n\nChange-Id: I693665a57465ec57f946fad57cda9ce48389408f\n" }, { "commit": "0a8978f04b4cc2e273545568b424756ee5a40a3d", "tree": "e997acff88142ee387d59b8c4a35cd0d716395b3", "parents": [ "ae7d4b13399d3fc0a3a57fe5082b6db89ec6e23f", "3380a775163f480f39d41572b06c433d45d42f79" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:09:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:09:09 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872\nam: 3380a77516\n\nChange-Id: Ice61f337e1fcfd0569431538e475d94f9d205423\n" }, { "commit": "933ea68aca684719f482721f301b014df2a14714", "tree": "dd53c45da73fa96d52b5a6f6e7dbd7317b72fcb5", "parents": [ "5e055b6a18201eb5e830a94d24d639941683a92e", "abdc2b47b3b6736e202663dee93f37e53f4e3ebf" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Thu Dec 22 17:06:06 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 22 17:06:06 2016 +0000" }, "message": "Merge \"Make users of MtpServer fill in DeviceInfo field values\"" }, { "commit": "709844aed410c2ed566c6e272411e99b175dcd2c", "tree": "c5532fee0cacbd83abb9f9c7ff60b0f574dc75d0", "parents": [ "f794c86972453792b4302b76cea3d04685194e9b", "1fc63da0e5effdb614fa7728fc25c2bb43641f19" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Dec 22 17:04:10 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:04:10 2016 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev\nam: 1fc63da0e5 -s ours\n\nChange-Id: Ib2099e20656223d72578b92a147f6041d5531438\n" }, { "commit": "3380a775163f480f39d41572b06c433d45d42f79", "tree": "c8a7af142499904f44444d96d2e9c96fbaedd666", "parents": [ "9a15881184e0549fd58f735ed418d7b0e42fc771", "d417e54872100f823b8f7bbba8910f0a3f51b1bc" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 17:04:07 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:04:07 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e\nam: d417e54872\n\nChange-Id: I2f47020055f962b36f095137d75c9cbfe6b1a6db\n" }, { "commit": "f794c86972453792b4302b76cea3d04685194e9b", "tree": "c5532fee0cacbd83abb9f9c7ff60b0f574dc75d0", "parents": [ "64a1060855f57bb6beb4bed56a3722b3bd484a5d", "7158c89582c41ddc0ed7e46ed9cfa16ffabb7e71" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Dec 22 17:04:07 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 17:04:07 2016 +0000" }, "message": "Import translations. DO NOT MERGE\nam: 7158c89582 -s ours\n\nChange-Id: Ibd294babd698ce66db219d5dd351b157b3158423\n" }, { "commit": "d417e54872100f823b8f7bbba8910f0a3f51b1bc", "tree": "b8f442b91f809ee1b0c3c26e87d5c0073a809c63", "parents": [ "a5affb045eccbfb621415e2d0b648338bede738a", "a206a0f17eeac58d00800db5841a08ac32ad26d1" ], "author": { "name": "Tom O\u0027Neill", "email": "tomo@google.com", "time": "Thu Dec 22 16:58:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 16:58:33 2016 +0000" }, "message": "Fix exploit where can hide the fact that a location was mocked\nam: a206a0f17e\n\nChange-Id: Ib3af056919a4b909d3d11dd3fe2b46eaa7cdf0f4\n" }, { "commit": "1fc63da0e5effdb614fa7728fc25c2bb43641f19", "tree": "97a9c8f1f4dff5bb3499ba0be1ae630f017e75a5", "parents": [ "45c9ba9c1582d65dc083097ad73e23d8f88ecc58", "7158c89582c41ddc0ed7e46ed9cfa16ffabb7e71" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 22 16:57:10 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 22 16:57:14 2016 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev" }, { "commit": "64a1060855f57bb6beb4bed56a3722b3bd484a5d", "tree": "c5532fee0cacbd83abb9f9c7ff60b0f574dc75d0", "parents": [ "8d8b116bfdb68db1fd6519fcafed0359538beb70", "45c9ba9c1582d65dc083097ad73e23d8f88ecc58" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Dec 22 08:08:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 08:08:08 2016 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev\nam: 45c9ba9c15 -s ours\n\nChange-Id: I55a93590829178eaabf1899be1a740c763676c24\n" }, { "commit": "8d8b116bfdb68db1fd6519fcafed0359538beb70", "tree": "c5532fee0cacbd83abb9f9c7ff60b0f574dc75d0", "parents": [ "f294cdeb27ca38d5026f993f4d2abf690a78b9b4", "0277a42568b8223db95bcbe004a6a8d9576ee5d9" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Dec 22 08:08:04 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 08:08:04 2016 +0000" }, "message": "Import translations. DO NOT MERGE\nam: 0277a42568 -s ours\n\nChange-Id: If66e092903c2f532c4473359e5e792de5a17d327\n" }, { "commit": "45c9ba9c1582d65dc083097ad73e23d8f88ecc58", "tree": "a74ff022a4e072880936a9aff015cfcb39770693", "parents": [ "1f0d972efc176c1807a7f6d793a3ace55219806d", "0277a42568b8223db95bcbe004a6a8d9576ee5d9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 22 08:00:05 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 22 08:00:09 2016 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev" }, { "commit": "7158c89582c41ddc0ed7e46ed9cfa16ffabb7e71", "tree": "ef6362d2a9b3fa00bc10c72c29338bf623164108", "parents": [ "fbe70a3e93ddf4e227f9529d482acf45cdf4d1c7" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Dec 21 19:50:32 2016 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Dec 21 19:50:32 2016 -0800" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: Id563dc4a6227745978c8999d577b0970c5c1103f\nAuto-generated-cl: translation import\n" }, { "commit": "0277a42568b8223db95bcbe004a6a8d9576ee5d9", "tree": "656adcfb87314ebbe9f147b0f038925331605b6a", "parents": [ "fbe70a3e93ddf4e227f9529d482acf45cdf4d1c7" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Dec 21 19:41:35 2016 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Dec 21 19:41:35 2016 -0800" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I292c850e85d1d11be974bc80ddd0ecd7a66ca557\nAuto-generated-cl: translation import\n" }, { "commit": "5e055b6a18201eb5e830a94d24d639941683a92e", "tree": "c16a4934696ecc76ec3667c5bf55fbea652ff21b", "parents": [ "425af45d0224e880380539882b1de425c5afe72c", "0a5b3e2fe9900b9d4ab0bd3de668b51d5fb2df9e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 22 03:11:57 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 22 03:11:58 2016 +0000" }, "message": "Merge \"Fix failing WifiNetworkScoreCacheTest.\"" }, { "commit": "f294cdeb27ca38d5026f993f4d2abf690a78b9b4", "tree": "c5532fee0cacbd83abb9f9c7ff60b0f574dc75d0", "parents": [ "9926363b0938f6ce8bdc6b1146867a0f1d65a97f", "1f0d972efc176c1807a7f6d793a3ace55219806d" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Dec 22 03:02:39 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 22 03:02:39 2016 +0000" }, "message": "NetworkNotificationManager: remove spammy log\nam: 1f0d972efc\n\nChange-Id: I01785760854cd040c0d09f76e3832bbb7986dc4e\n" }, { "commit": "9f47a5d85eca1f93833b328dea3d31fc36d79591", "tree": "5b69676ce5b0491727f4606f88a8f61e40834bf4", "parents": [ "9ec4256a17f082bbf794336ec5d43616f4662ccf" ], "author": { "name": "pkanwar", "email": "pkanwar@google.com", "time": "Sat Dec 17 20:16:48 2016 -0800" }, "committer": { "name": "pkanwar", "email": "pkanwar@google.com", "time": "Wed Dec 21 17:39:35 2016 -0800" }, "message": "DO NOT MERGE: Add API to indicate carrier networks.\n\nBug: 31003437\nChange-Id: I3e3989256588f509c45e50374b8b7168589d6c5d\n" }, { "commit": "1f0d972efc176c1807a7f6d793a3ace55219806d", "tree": "bcade1c372002bb2540db2250dde68ed90d1e193", "parents": [ "4869a55f66451222579ffe9d15d829a86a401f09" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Dec 22 09:49:11 2016 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Dec 22 09:51:01 2016 +0900" }, "message": "NetworkNotificationManager: remove spammy log\n\nTest: build, flashed, booted phone.\nBug: 32198726\nChange-Id: I3ac2f07c756f48653195f6198aaee4d8b3939fb5\n" }, { "commit": "0a5b3e2fe9900b9d4ab0bd3de668b51d5fb2df9e", "tree": "c16a4934696ecc76ec3667c5bf55fbea652ff21b", "parents": [ "425af45d0224e880380539882b1de425c5afe72c" ], "author": { "name": "Sundeep Ghuman", "email": "sghuman@google.com", "time": "Wed Dec 21 16:44:46 2016 -0800" }, "committer": { "name": "Sundeep Ghuman", "email": "sghuman@google.com", "time": "Wed Dec 21 16:44:46 2016 -0800" }, "message": "Fix failing WifiNetworkScoreCacheTest.\n\nThere was a NPE thrown by an unintialized mock.\n\nBug: 33818187\nTest: Android unit tests\nChange-Id: I478885dcebaf41f93488a6a12bb83652ad462be5\n" }, { "commit": "425af45d0224e880380539882b1de425c5afe72c", "tree": "5d04c2c0ca758de8da3b35339ecbee8bc6a34082", "parents": [ "4a04c07df403376f325f168bbc1031307193a325", "0d79bdef27c75d06797856d3289194a5327f90e8" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Dec 22 00:03:56 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 22 00:03:57 2016 +0000" }, "message": "Merge \"Cherrypick: Define the calculateRankingScore method and Key.\"" }, { "commit": "4a04c07df403376f325f168bbc1031307193a325", "tree": "6007ebb5fecd61f340ddf72f23c87ce471bcdb8f", "parents": [ "febd982cdd61ecad34c4d463fb63d2a4836d26ea", "b1365852cccc0d15bd2b278b929f952e75417f2d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Dec 21 22:58:40 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 21 22:58:41 2016 +0000" }, "message": "Merge changes I40f055df,I562713df\n\n* changes:\n Stay bound to the most current active scorer.\n Clear and restore the calling ID.\n" }, { "commit": "0d79bdef27c75d06797856d3289194a5327f90e8", "tree": "ac687531296f2cba4cab52f5c9503dec2ea76e30", "parents": [ "f23ea2ca62e2e652004f538e55282c140c3813a4" ], "author": { "name": "Sundeep Ghuman", "email": "sghuman@google.com", "time": "Wed Dec 07 13:32:33 2016 -0800" }, "committer": { "name": "Sundeep Ghuman", "email": "sghuman@google.com", "time": "Wed Dec 21 13:57:24 2016 -0800" }, "message": "Cherrypick: Define the calculateRankingScore method and Key.\n\nDefine the key to be used to store the rankingScoreOffset inside the\nScoredNetwork bundle. Implement a platform API method to calculate the\nranking score for a given rssi.\n\nOCL: ag/1688711\n\nBug: 33049302\nTest: Unit tests\nChange-Id: Ia3fea2197d7c211a2313fced8713d79d8d5f4f6e\nMerged-In: Ia3fea2197d7c211a2313fced8713d79d8d5f4f6e\nTopic: ScoredNetworkRankingScore\n" }, { "commit": "abdc2b47b3b6736e202663dee93f37e53f4e3ebf", "tree": "38aebbc08d7c69086a599c0a7069aab8b5f7ac86", "parents": [ "26e50963641189733f32362b8db39a3a6f1e19fd" ], "author": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Wed Dec 21 11:19:52 2016 -0800" }, "committer": { "name": "Alex Klyubin", "email": "klyubin@google.com", "time": "Wed Dec 21 13:56:28 2016 -0800" }, "message": "Make users of MtpServer fill in DeviceInfo field values\n\nThis is part of weaning apps off accessing system identifiers via\nsystem properties API. Apps should use android.os.Build API instead.\n\nBug: 33700679\nTest: Enable MTP mode then check that mtp-detect output same as before this commit\nChange-Id: I4e6696cdee18b9c3e987c432c095911e85a997db\n" }, { "commit": "b1365852cccc0d15bd2b278b929f952e75417f2d", "tree": "6007ebb5fecd61f340ddf72f23c87ce471bcdb8f", "parents": [ "29ed4a99bf3fae207f2359de34d3b37edf15e3dc" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Dec 20 16:59:26 2016 -0800" }, "committer": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Wed Dec 21 13:44:53 2016 -0800" }, "message": "Stay bound to the most current active scorer.\n\nThis fixes the following issue:\n\n1) Scorer A is active and bound.\n2) A change occurs to Scorer A such that it is no longer the selected\n scorer.\n3) Scorer B is selected as the scorer and returned whenever\n getActiveScorer() is queried.\n4) Scorer A is never unbound because it isn\u0027t seen as the active\n scorer.\n5) Scorer B is never bound until its package changes in some way (or\n the feature is disabled/enabled).\n\nTest: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest + manual testing.\nChange-Id: I40f055df472e2b9e7b07e6979a841dd4c0b794ce\nMerged-In: I468a8c02a72f089f1fb778d150d945efe5485b88\n" }, { "commit": "29ed4a99bf3fae207f2359de34d3b37edf15e3dc", "tree": "99c5ed3c68b4ad19876f5cf9789386d9365d4a46", "parents": [ "febd982cdd61ecad34c4d463fb63d2a4836d26ea" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Dec 20 14:36:20 2016 -0800" }, "committer": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Wed Dec 21 13:39:10 2016 -0800" }, "message": "Clear and restore the calling ID.\n\nClear and restore the calling identity in IPC methods after asserting\nthe caller has the required permissions.\n\nFixed 2 tests in NetworkScoreServiceTest that were failing due to a\nrecent refactor.\n\nTest: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest\nBUG: 33781319\nChange-Id: I562713df3d9455cdc02bf80a687940fb9daecd8f\nMerged-In: Icd79751d12dcfe4af8026980aaa1f7bd463468dc\n" }, { "commit": "febd982cdd61ecad34c4d463fb63d2a4836d26ea", "tree": "3427ae288020ea79fd842582b3dc0e404dac3108", "parents": [ "a93e57f1acbb4bb15a2516018973457bfff8d8d5", "d18ffd8223282285ab5e6a576976c115e50bd509" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Dec 21 21:11:19 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 21 21:11:20 2016 +0000" }, "message": "Merge \"Avoid Calendar\u0027s unexpect change in snapToCycleDay()\"" }, { "commit": "9926363b0938f6ce8bdc6b1146867a0f1d65a97f", "tree": "eeec3a85f3dcf34103a6450489d702c56cbf6ee6", "parents": [ "cca4e6d093db0d6ad6aff7367b5bc772b7848b97", "471093b58e97ab2ea310c7743acb7674a07f7391" ], "author": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Wed Dec 21 20:10:30 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 21 20:10:30 2016 +0000" }, "message": "Merge \"Expose ScanResult#untrusted as a @SystemApi.\" am: a93e57f1ac am: a3943850ab\nam: 471093b58e\n\nChange-Id: I129d3abd329d9e00de1177ca39cf3ce0ff06946b\n" }, { "commit": "cca4e6d093db0d6ad6aff7367b5bc772b7848b97", "tree": "411eec865fe6e68f948dd132b1225820a8cd7703", "parents": [ "e6395f8ac7e923bfa1a875b3161261538eb8cdb5", "4869a55f66451222579ffe9d15d829a86a401f09" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Dec 21 20:06:14 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 21 20:06:14 2016 +0000" }, "message": "Merge \"DirectReply: Close if touching outside status bar\" into nyc-mr2-dev\nam: 4869a55f66\n\nChange-Id: Icab4bdb1181a6b321ba78e954920576d1d79161a\n" }, { "commit": "e6395f8ac7e923bfa1a875b3161261538eb8cdb5", "tree": "411eec865fe6e68f948dd132b1225820a8cd7703", "parents": [ "57c829c2910c68fc60fc69aca62298f262cc7136", "6d53de63bbe3880129f8fc7a08cb89141fbaa103" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Dec 21 20:06:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 21 20:06:08 2016 +0000" }, "message": "DirectReply: Close if touching outside status bar\nam: 6d53de63bb\n\nChange-Id: I134abad75cae32c8eb9229ac8aa993f9bd71b667\n" }, { "commit": "471093b58e97ab2ea310c7743acb7674a07f7391", "tree": "b2345d2834cdc8a586c08d4faa92630317a17d27", "parents": [ "e286d1b2f8eaee8a6ee4c2df8817ae749ce68a33", "a3943850ab67dc2df1639202de6735c3991e4dc8" ], "author": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Wed Dec 21 20:02:03 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 21 20:02:03 2016 +0000" }, "message": "Merge \"Expose ScanResult#untrusted as a @SystemApi.\" am: a93e57f1ac\nam: a3943850ab\n\nChange-Id: Id763d2f82e10dd5843258ef09d0e65824e2c2de6\n" }, { "commit": "4869a55f66451222579ffe9d15d829a86a401f09", "tree": "3b0f267af668a9a686c53e659e3dfe1121cf3898", "parents": [ "fbe70a3e93ddf4e227f9529d482acf45cdf4d1c7", "6d53de63bbe3880129f8fc7a08cb89141fbaa103" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Dec 21 19:56:38 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 21 19:56:42 2016 +0000" }, "message": "Merge \"DirectReply: Close if touching outside status bar\" into nyc-mr2-dev" }, { "commit": "a3943850ab67dc2df1639202de6735c3991e4dc8", "tree": "8dd3ca666da4373eda51aa9748d62ca907b5ce6c", "parents": [ "fe35f0f4f6870e4891be1b171e7d691d7f49f23a", "a93e57f1acbb4bb15a2516018973457bfff8d8d5" ], "author": { "name": "Amin Shaikh", "email": "ashaikh@google.com", "time": "Wed Dec 21 19:56:19 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 21 19:56:19 2016 +0000" }, "message": "Merge \"Expose ScanResult#untrusted as a @SystemApi.\"\nam: a93e57f1ac\n\nChange-Id: I9cac16dbceb36d6ff72e92d2ab8de20bd8d70e36\n" }, { "commit": "a93e57f1acbb4bb15a2516018973457bfff8d8d5", "tree": "759cf48d47792165b416b8bf8de3183d2433144f", "parents": [ "48d5d6cda821282a77926795237ce895cc1dfde7", "3d18c621cbff73fb6fe4bf68ae55c17c8545d3e9" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Dec 21 19:47:31 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Dec 21 19:47:32 2016 +0000" }, "message": "Merge \"Expose ScanResult#untrusted as a @SystemApi.\"" } ], "next": "3d18c621cbff73fb6fe4bf68ae55c17c8545d3e9" }