)]}' { "log": [ { "commit": "c5eacceb3f628561b0bad9a101c577fc1832b707", "tree": "0e981255cbb2b083b6d855c6ba45d9818b720897", "parents": [ "5e8b2e411064978b84fba2e0e354ae45e7dd6494", "4d75bee99b259503d376a7c1604f426001bba75c" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Wed Nov 02 10:28:54 2016 -0700" }, "committer": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Wed Nov 02 10:33:27 2016 -0700" }, "message": "resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp\n\nChange-Id: Ib11bb52c9d3826e02089485af93856ba891ad034\n" }, { "commit": "4d75bee99b259503d376a7c1604f426001bba75c", "tree": "6ac758436842ddd8bf9135d520253ee675dc8ebd", "parents": [ "fdfc79a8788aefe7a26d54a85c14398602811165" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Fri Oct 28 12:29:55 2016 -0700" }, "committer": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Wed Nov 02 09:20:22 2016 -0700" }, "message": "Modify ConnectionServiceAdapter to include Session\n\nModifies the ConnectionServiceAdapter to include Session Information in\nthe AIDL interface so that external Sessions can be started in Telecom\nfrom Telephony.\n\nTest: Manual testing and Unit Tests pass\nBug: 26571395\nChange-Id: I31bbfe433dd062a50bd05083e1a639dd4cd03403\n" }, { "commit": "5e8b2e411064978b84fba2e0e354ae45e7dd6494", "tree": "58cdefae00b0bb11c38430fbaf43b094218a7375", "parents": [ "5602b26f4167355d4b59df41bb6ce60176a60ab6", "f41abccf807177e21dd0173d207e7c89cd02c4b8" ], "author": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Wed Nov 02 01:11:53 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 02 01:11:53 2016 +0000" }, "message": "Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am: cf4dc9236e\nam: f41abccf80\n\nChange-Id: I12c36ffe83fbab6bb33d1d60581d6253f6f52fd0\n" }, { "commit": "5602b26f4167355d4b59df41bb6ce60176a60ab6", "tree": "58cdefae00b0bb11c38430fbaf43b094218a7375", "parents": [ "1c21f0378ac1ff8c698190f95f7960408571524c", "b13240028b16d4a70dbb3aa09d52a28926419eba" ], "author": { "name": "Joseph Pirozzo", "email": "pirozzoj@google.com", "time": "Wed Nov 02 01:11:04 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 02 01:11:04 2016 +0000" }, "message": "MAP MCE am: b8fc0679e8\nam: b13240028b\n\nChange-Id: I62a9a758bc46fbb1174fbce4d50f488932d65113\n" }, { "commit": "1c21f0378ac1ff8c698190f95f7960408571524c", "tree": "34c5d4d5e687f3321f52a242d114c760483cb814", "parents": [ "c4129145203039072541e4415cb20c2103ca34f2", "a31933abc37ec2b3116472dde7801705785a0939" ], "author": { "name": "Joseph Pirozzo", "email": "pirozzoj@google.com", "time": "Wed Nov 02 01:10:02 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 02 01:10:02 2016 +0000" }, "message": "Pbap disconnect durring connect am: a4f0127fbb\nam: a31933abc3\n\nChange-Id: I73772d90dea4b9f3f70daef1b7b6ce44cfafb0e5\n" }, { "commit": "c4129145203039072541e4415cb20c2103ca34f2", "tree": "391f3f75b9b4436d998e6f3d0ce5915782088b9d", "parents": [ "de915e3ade1b067790698d2723b538eb75a76c15", "d94c280a7f28f0f87ccd2a72b5814f5962756007" ], "author": { "name": "Joseph Pirozzo", "email": "pirozzoj@google.com", "time": "Wed Nov 02 01:09:14 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 02 01:09:14 2016 +0000" }, "message": "MAP MCE am: 631768d814\nam: d94c280a7f\n\nChange-Id: I6a765b9a07204afca2763fb98fdb2e92e08292e5\n" }, { "commit": "f41abccf807177e21dd0173d207e7c89cd02c4b8", "tree": "c9fbe5b819dcf741f65e5fd2cf98ffd8035c3b8d", "parents": [ "b13240028b16d4a70dbb3aa09d52a28926419eba", "cf4dc9236e6319f233edc9c16730c6db4b416ae4" ], "author": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Wed Nov 02 01:05:20 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 02 01:05:20 2016 +0000" }, "message": "Merge changes Icac17694,Ic0b651f3,Ifa2cdea7\nam: cf4dc9236e\n\nChange-Id: I9ca9384c21903fbe97f4cb1c0bc64c27e04b5401\n" }, { "commit": "b13240028b16d4a70dbb3aa09d52a28926419eba", "tree": "c9fbe5b819dcf741f65e5fd2cf98ffd8035c3b8d", "parents": [ "a31933abc37ec2b3116472dde7801705785a0939", "b8fc0679e84f9cadc08524ea89f6e1b28631f3e5" ], "author": { "name": "Joseph Pirozzo", "email": "pirozzoj@google.com", "time": "Wed Nov 02 01:05:14 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 02 01:05:14 2016 +0000" }, "message": "MAP MCE\nam: b8fc0679e8\n\nChange-Id: Id82f047bc2d0eb7e4f04c14cfc216854e066156f\n" }, { "commit": "a31933abc37ec2b3116472dde7801705785a0939", "tree": "894a5b1c89d4925a6197dee4fd30bfc9f68b0506", "parents": [ "d94c280a7f28f0f87ccd2a72b5814f5962756007", "a4f0127fbb39dd4cf6d8bad61f8f7224fdc9153a" ], "author": { "name": "Joseph Pirozzo", "email": "pirozzoj@google.com", "time": "Wed Nov 02 01:04:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 02 01:04:33 2016 +0000" }, "message": "Pbap disconnect durring connect\nam: a4f0127fbb\n\nChange-Id: Ib2f65418dee82893a377b780647d823cfa274dd6\n" }, { "commit": "d94c280a7f28f0f87ccd2a72b5814f5962756007", "tree": "ea37c087294005784062e68b06d466e965564fb7", "parents": [ "4c65d49a92f2d5746ccba85ededc1be42d784981", "631768d81469f83552de05bf0ec839d1cd6eab04" ], "author": { "name": "Joseph Pirozzo", "email": "pirozzoj@google.com", "time": "Wed Nov 02 01:03:51 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 02 01:03:51 2016 +0000" }, "message": "MAP MCE\nam: 631768d814\n\nChange-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9\n" }, { "commit": "cf4dc9236e6319f233edc9c16730c6db4b416ae4", "tree": "670a375274709e2a292a60a1123f2d57e3650e39", "parents": [ "7f64c195f73065fb5350887ebdd1ff865d3c7697", "b8fc0679e84f9cadc08524ea89f6e1b28631f3e5" ], "author": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Wed Nov 02 00:55:40 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 02 00:55:40 2016 +0000" }, "message": "Merge changes Icac17694,Ic0b651f3,Ifa2cdea7\n\n* changes:\n MAP MCE\n Pbap disconnect durring connect\n MAP MCE\n" }, { "commit": "de915e3ade1b067790698d2723b538eb75a76c15", "tree": "c860d3d53126c161a73df5adf7722fc215a5e507", "parents": [ "e07c4cb4e6a95a2167a9f62ba0cc69c116d65892", "4c65d49a92f2d5746ccba85ededc1be42d784981" ], "author": { "name": "Tomasz Mikolajewski", "email": "mtomasz@google.com", "time": "Wed Nov 02 00:39:45 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 02 00:39:45 2016 +0000" }, "message": "Merge \"Add support for opening JAR/ZIP files via FD.\" am: 7f64c195f7\nam: 4c65d49a92\n\nChange-Id: I534e70f5218e0f9be73d919a4c9dd509211729f8\n" }, { "commit": "b8fc0679e84f9cadc08524ea89f6e1b28631f3e5", "tree": "670a375274709e2a292a60a1123f2d57e3650e39", "parents": [ "a4f0127fbb39dd4cf6d8bad61f8f7224fdc9153a" ], "author": { "name": "Joseph Pirozzo", "email": "pirozzoj@google.com", "time": "Thu Oct 06 11:44:53 2016 -0700" }, "committer": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Tue Nov 01 17:39:16 2016 -0700" }, "message": "MAP MCE\n\nFix @LINK to @link in javadoc.\n\nBug: 30467210\nChange-Id: Icac176947bee971c3f5d11fd4166cf8ceb0a437e\n(cherry picked from commit f5fba751d360bbe8294c4640f5ad12a990f13122)\n" }, { "commit": "a4f0127fbb39dd4cf6d8bad61f8f7224fdc9153a", "tree": "6bbe454dc9e42a8f81a91f6f6da87c59d28bde6f", "parents": [ "631768d81469f83552de05bf0ec839d1cd6eab04" ], "author": { "name": "Joseph Pirozzo", "email": "pirozzoj@google.com", "time": "Mon May 02 07:30:21 2016 -0700" }, "committer": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Tue Nov 01 17:39:16 2016 -0700" }, "message": "Pbap disconnect durring connect\n\nDurring a connect call disconnect from all other pbap devices rather\nthan from the device you are trying to connect to.\n\nbug: 28406739\nChange-Id: Ic0b651f32a0da18950fbc190b1d4503d69ebd203\n(cherry picked from commit bdd24942e47811ffe6bb9814934e6b08a8190e7e)\n" }, { "commit": "631768d81469f83552de05bf0ec839d1cd6eab04", "tree": "38dba8a361565364a245d36cf8fac71c75b368c8", "parents": [ "7f64c195f73065fb5350887ebdd1ff865d3c7697" ], "author": { "name": "Joseph Pirozzo", "email": "pirozzoj@google.com", "time": "Thu Sep 01 14:19:28 2016 -0700" }, "committer": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Tue Nov 01 17:39:16 2016 -0700" }, "message": "MAP MCE\n\nAdd MAP client code into packages/apps/Bluetooth. Changes here are to\ndefine the MAP MCE interface and enable its selection when running on a\ndevice that is also running a PBAP client (Car Kitt).\n\nBug: 30467210\nChange-Id: Ifa2cdea7d67f63a2b5f3d971df8ec6d321dc5fee\n(cherry picked from commit 433b3054847951e8e7b3864d11990604a66b8651)\n" }, { "commit": "4c65d49a92f2d5746ccba85ededc1be42d784981", "tree": "70cdfec36aa69d87a45ca89d3995f02cebfa522e", "parents": [ "6f84631d8da968ec09e14d75622c53abec9fa300", "7f64c195f73065fb5350887ebdd1ff865d3c7697" ], "author": { "name": "Tomasz Mikolajewski", "email": "mtomasz@google.com", "time": "Wed Nov 02 00:34:47 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 02 00:34:47 2016 +0000" }, "message": "Merge \"Add support for opening JAR/ZIP files via FD.\"\nam: 7f64c195f7\n\nChange-Id: I88af6f42ccd5e6edafa57fd0f147f676da8aa096\n" }, { "commit": "7f64c195f73065fb5350887ebdd1ff865d3c7697", "tree": "09dd8cb9f5e207d9f985abae5c353514538a5407", "parents": [ "0a86c936a6490064d8cbd99d5f11e17473a04e22", "6c3df1543cb85d5ff7ebb2b026d7a34184465c7b" ], "author": { "name": "Tomasz Mikolajewski", "email": "mtomasz@google.com", "time": "Wed Nov 02 00:24:06 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 02 00:24:07 2016 +0000" }, "message": "Merge \"Add support for opening JAR/ZIP files via FD.\"" }, { "commit": "e07c4cb4e6a95a2167a9f62ba0cc69c116d65892", "tree": "ecaf1dc0f77ea721d725691a74b7007ec31724dc", "parents": [ "8a8f33416b71715be84f833b678fb3abc6e8a05a", "6f84631d8da968ec09e14d75622c53abec9fa300" ], "author": { "name": "Bryce Lee", "email": "brycelee@google.com", "time": "Tue Nov 01 23:24:42 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Nov 01 23:24:42 2016 +0000" }, "message": "Merge \"Add a way to query for supported Bluetooth profiles.\" am: 0a86c936a6\nam: 6f84631d8d\n\nChange-Id: I8d9bce44587a1740f0acbd09552baf7d8b6990a5\n" }, { "commit": "6f84631d8da968ec09e14d75622c53abec9fa300", "tree": "2825f9e4e779a0148e366eb0ca763496e5739feb", "parents": [ "fdfc79a8788aefe7a26d54a85c14398602811165", "0a86c936a6490064d8cbd99d5f11e17473a04e22" ], "author": { "name": "Bryce Lee", "email": "brycelee@google.com", "time": "Tue Nov 01 23:20:16 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Nov 01 23:20:16 2016 +0000" }, "message": "Merge \"Add a way to query for supported Bluetooth profiles.\"\nam: 0a86c936a6\n\nChange-Id: Id10ad10a5dbcab92e390a7a245772d2b551ad30c\n" }, { "commit": "0a86c936a6490064d8cbd99d5f11e17473a04e22", "tree": "b074571fffbb46441b822b0b6a67197ad7ed0fe0", "parents": [ "8bcd1592344abe240308a4030d73838d89d17054", "f6b74dea040e3be9693a977605e9eb46c7e4032a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Nov 01 23:12:21 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Nov 01 23:12:22 2016 +0000" }, "message": "Merge \"Add a way to query for supported Bluetooth profiles.\"" }, { "commit": "f6b74dea040e3be9693a977605e9eb46c7e4032a", "tree": "b074571fffbb46441b822b0b6a67197ad7ed0fe0", "parents": [ "8bcd1592344abe240308a4030d73838d89d17054" ], "author": { "name": "Bryce Lee", "email": "brycelee@google.com", "time": "Sun Oct 09 12:54:42 2016 -0700" }, "committer": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Tue Nov 01 15:13:04 2016 -0700" }, "message": "Add a way to query for supported Bluetooth profiles.\n\nCurrently there is no way to get the profiles supported by the Bluetooth\nadapter. Asking for a profile proxy of an unsupported profile does not\nfail and can lead to code indefinitely waiting for the proxy response. This\nnew code will allow for checking the supported profiles before asking for\nthe proxies.\n\nBug: 26451648\nChange-Id: I4b48e7151f5ca53851aa3b967c143fae140ecd34\n(cherry picked from commit b1301fa2849bafd6daa422281dc5200863bc761e)\n" }, { "commit": "8a8f33416b71715be84f833b678fb3abc6e8a05a", "tree": "ecaf1dc0f77ea721d725691a74b7007ec31724dc", "parents": [ "9e33f453a3af6700c20f1503aa7714ef91fbbea1", "fdfc79a8788aefe7a26d54a85c14398602811165" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Nov 01 17:24:19 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Nov 01 17:24:19 2016 +0000" }, "message": "Merge \"Zygote: Avoid string concatentation for systrace\" am: 8bcd159234\nam: fdfc79a878\n\nChange-Id: I105f07f2b2ca925139da6fc78641ee486eb68410\n" }, { "commit": "fdfc79a8788aefe7a26d54a85c14398602811165", "tree": "ecc6cc90e12cad7ec53d639327384e110ca32dbc", "parents": [ "50cc13cc18935745968987ca20e62cbffba9cb95", "8bcd1592344abe240308a4030d73838d89d17054" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Tue Nov 01 17:19:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Nov 01 17:19:44 2016 +0000" }, "message": "Merge \"Zygote: Avoid string concatentation for systrace\"\nam: 8bcd159234\n\nChange-Id: I484e5a56b790f57d097970f727959438debafafb\n" }, { "commit": "8bcd1592344abe240308a4030d73838d89d17054", "tree": "ea25700b898af77a387dc89490b9933ca464db91", "parents": [ "ba63f32ed588d236da49a513b5fe7c54ae6fb11d", "c425362049390c61c0654ea2510f5c5c1db8588e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Nov 01 15:38:49 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Nov 01 15:38:50 2016 +0000" }, "message": "Merge \"Zygote: Avoid string concatentation for systrace\"" }, { "commit": "6c3df1543cb85d5ff7ebb2b026d7a34184465c7b", "tree": "f47dd7b40ae88f58f87be2dbc9d73cc1bf1bb333", "parents": [ "678ba24533139c1e54a9729f3ad9f4614da8fbad" ], "author": { "name": "Tomasz Mikolajewski", "email": "mtomasz@google.com", "time": "Thu Oct 20 10:49:53 2016 +0900" }, "committer": { "name": "Tomasz Mikolajewski", "email": "mtomasz@google.com", "time": "Tue Nov 01 09:25:59 2016 +0900" }, "message": "Add support for opening JAR/ZIP files via FD.\n\nTest: Upcoming change in DocumentsUI uses this feature.\nBug: 31783726\nChange-Id: Ia74e9bdb66722dfb2855380375a99cc94d288b2e\n(cherry picked from commit 5a5c44a2e30a55843802b472f2f8be81496bbd25)\n" }, { "commit": "9e33f453a3af6700c20f1503aa7714ef91fbbea1", "tree": "a94d64001b2f7b13e874d012e826fb56b9ebebf5", "parents": [ "635d52887704194420f6d1eb5cf6814d731ed1b0", "50cc13cc18935745968987ca20e62cbffba9cb95" ], "author": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Mon Oct 31 19:25:34 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 31 19:25:34 2016 +0000" }, "message": "Merge \"Configuration for priority/auto-connection for PAN.\" am: ba63f32ed5\nam: 50cc13cc18\n\nChange-Id: I6725098623dba530db325f6b12d5193f9f2629e7\n" }, { "commit": "50cc13cc18935745968987ca20e62cbffba9cb95", "tree": "c1d73d11770cdaae326c6fe6886f131e6a8e75ef", "parents": [ "879a5169ec226fa6b8c0c6d1e97e17591ee4a817", "ba63f32ed588d236da49a513b5fe7c54ae6fb11d" ], "author": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Mon Oct 31 19:19:30 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 31 19:19:30 2016 +0000" }, "message": "Merge \"Configuration for priority/auto-connection for PAN.\"\nam: ba63f32ed5\n\nChange-Id: I00ecde6e7f1c64f704341c7a96e476f1a11bdaea\n" }, { "commit": "ba63f32ed588d236da49a513b5fe7c54ae6fb11d", "tree": "71f285fe94063fede99eed25b8996dc3f326e5b5", "parents": [ "6a31a5c2dd02fc6cc0a746f03b9ce85fadba45be", "773297a83e4fe09be911fcf4598e030cc4b72e68" ], "author": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Mon Oct 31 19:08:53 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 31 19:08:54 2016 +0000" }, "message": "Merge \"Configuration for priority/auto-connection for PAN.\"" }, { "commit": "635d52887704194420f6d1eb5cf6814d731ed1b0", "tree": "8518c7af2ec0435a244c25f073dbab9e3fc1e221", "parents": [ "3030cd855b3e1678c0855d1c30bd334da1ba6992", "879a5169ec226fa6b8c0c6d1e97e17591ee4a817" ], "author": { "name": "Marie Janssen", "email": "jamuraa@google.com", "time": "Mon Oct 31 18:47:52 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 31 18:47:52 2016 +0000" }, "message": "resolve merge conflicts of 6a31a5c to stage-aosp-master\nam: 879a5169ec\n\nChange-Id: Ib6321dee7357920c73b135fbe465998dc4469e66\n" }, { "commit": "879a5169ec226fa6b8c0c6d1e97e17591ee4a817", "tree": "ade0e5df7e1d209db2df9413573743182ea1ee49", "parents": [ "9e4d4ee4843f855a9a6a15367f49404d4b5b6ef4", "6a31a5c2dd02fc6cc0a746f03b9ce85fadba45be" ], "author": { "name": "Marie Janssen", "email": "jamuraa@google.com", "time": "Mon Oct 31 11:00:06 2016 -0700" }, "committer": { "name": "Marie Janssen", "email": "jamuraa@google.com", "time": "Mon Oct 31 11:00:06 2016 -0700" }, "message": "resolve merge conflicts of 6a31a5c to stage-aosp-master\n\nChange-Id: I29f2085f4656b0b57896ef505ef6a50cdbd1b194\n" }, { "commit": "773297a83e4fe09be911fcf4598e030cc4b72e68", "tree": "71f285fe94063fede99eed25b8996dc3f326e5b5", "parents": [ "6a31a5c2dd02fc6cc0a746f03b9ce85fadba45be" ], "author": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Thu Aug 04 16:16:20 2016 -0700" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Oct 31 17:45:32 2016 +0000" }, "message": "Configuration for priority/auto-connection for PAN.\n\nWe protect the auto-connection via a flag so that it is only enabled on\nsome devices.\n\nBug: b/30679978\nChange-Id: I5b7f273e09a659b561913d5c6f3a76feb245e6ce\n(cherry picked from commit 1f09d5f255980488cabd55a5c44a5737e24541d8)\n" }, { "commit": "6a31a5c2dd02fc6cc0a746f03b9ce85fadba45be", "tree": "0de2c73deb9788e1ff7b7fcf534e202d928fb90b", "parents": [ "78a63c1cf0519b57adc906d30ab145d473de1a9e", "6a383a7d329f04b0eecd760b98a888d44d84b862" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Oct 31 17:20:39 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 31 17:20:39 2016 +0000" }, "message": "Merge \"Bluetooth: prevent enabling BLE in airplane mode\"" }, { "commit": "3030cd855b3e1678c0855d1c30bd334da1ba6992", "tree": "2ab824459f3e9f5b0670f8c2ea97de8b8de4c204", "parents": [ "9527a19cbcc61104729c7d6af3bea4de36b146d5", "9e4d4ee4843f855a9a6a15367f49404d4b5b6ef4" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Mon Oct 31 17:17:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 31 17:17:57 2016 +0000" }, "message": "Merge \"Modify AIDLs to include Session.Info\" am: 78a63c1cf0\nam: 9e4d4ee484\n\nChange-Id: I9da7f4106bfec8ebba4515223a9dba40ffdaef20\n" }, { "commit": "9e4d4ee4843f855a9a6a15367f49404d4b5b6ef4", "tree": "d74fcd8aff5cfc1bf37c104d1e6670ade5c8fd2a", "parents": [ "958dab93cde1c05a8ae9cb4cba1acbbce9bced63", "78a63c1cf0519b57adc906d30ab145d473de1a9e" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Mon Oct 31 17:12:26 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Oct 31 17:12:26 2016 +0000" }, "message": "Merge \"Modify AIDLs to include Session.Info\"\nam: 78a63c1cf0\n\nChange-Id: I0549ace3cc383bebac86a8b49cb87f631aecb552\n" }, { "commit": "78a63c1cf0519b57adc906d30ab145d473de1a9e", "tree": "fea98637eab99e4efccc7a59e741dc23d1ecf857", "parents": [ "678ba24533139c1e54a9729f3ad9f4614da8fbad", "3445f829077cea72da77e31f0a2f6ccce3af295b" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Mon Oct 31 17:04:50 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 31 17:04:50 2016 +0000" }, "message": "Merge \"Modify AIDLs to include Session.Info\"" }, { "commit": "6a383a7d329f04b0eecd760b98a888d44d84b862", "tree": "a3853d51db3d5658f235deaef24390ae8b6905be", "parents": [ "678ba24533139c1e54a9729f3ad9f4614da8fbad" ], "author": { "name": "Marie Janssen", "email": "jamuraa@google.com", "time": "Tue Oct 25 10:47:51 2016 -0700" }, "committer": { "name": "Marie Janssen", "email": "jamuraa@google.com", "time": "Mon Oct 31 09:06:36 2016 -0700" }, "message": "Bluetooth: prevent enabling BLE in airplane mode\n\nEnabling BLE in airplane mode puts BluetoothManagerService in an\nunexpected state which causes Bluetooth to be on when airplane mode\nis disabled.\n\nAlso fixes a bug where a crash of a BLE client would trigger a restart\ninto ON mode.\n\nTest: SL4A BleBackgroundScanTest:test_airplane_mode_disables_ble\n\nBug: 32140251\nBug: 32140271\nBug: 32369494\n\nChange-Id: Ie65157e65c3a1ca914f567a7a0c631175d1e5835\n" }, { "commit": "c425362049390c61c0654ea2510f5c5c1db8588e", "tree": "f01a9d4d0fa1869e0252b3f082e8eb4d38b8e81b", "parents": [ "ec3e884e8855f3158814eb1e4cec6919b35766d4" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Oct 28 18:19:30 2016 -0700" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Oct 28 18:19:30 2016 -0700" }, "message": "Zygote: Avoid string concatentation for systrace\n\nAvoid the allocation of an unneeded string. With more than 4000\nclasses being preloaded, this adds up.\n\nTest: m\nTest: device boots\nChange-Id: I61f10f61ebdd08d17e09aaedd8bf54cc40c41838\n" }, { "commit": "9527a19cbcc61104729c7d6af3bea4de36b146d5", "tree": "2ab824459f3e9f5b0670f8c2ea97de8b8de4c204", "parents": [ "ccd8315969bee2f0e3f178593bb3f345d58e09b6", "958dab93cde1c05a8ae9cb4cba1acbbce9bced63" ], "author": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Fri Oct 28 20:19:14 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 20:19:14 2016 +0000" }, "message": "Merge \"Use UUIDs for call management in Headset Client (HF)\" am: 678ba24533\nam: 958dab93cd\n\nChange-Id: Ie21c9be4b7177179ea4588d2832d0bbf72e7a3c1\n" }, { "commit": "ccd8315969bee2f0e3f178593bb3f345d58e09b6", "tree": "fdfdb97ba0485b8e4fde319ad31dee7ff6fd3a95", "parents": [ "668a6fa227965f744dcee046855cfdde0f14969d", "aacbdf59d616fd736e0a5041907572a69c175419" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Fri Oct 28 20:17:15 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 20:17:15 2016 +0000" }, "message": "Merge \"Modify AIDLs to include Session.Info\" into stage-aosp-master\nam: aacbdf59d6\n\nChange-Id: I272539ea7124fa18e42ee6f06c89d3ffca449934\n" }, { "commit": "668a6fa227965f744dcee046855cfdde0f14969d", "tree": "fdfdb97ba0485b8e4fde319ad31dee7ff6fd3a95", "parents": [ "4aa38633fe2988ef583c05c2e420242d2b774ffa", "b32d4f8b5cd5b9c2415e291896b83267e1b4d5fe" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Fri Oct 28 20:17:03 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 20:17:03 2016 +0000" }, "message": "Modify AIDLs to include Session.Info\nam: b32d4f8b5c\n\nChange-Id: Ibbac4c74b5a0c4fcd5524c97acef5fc078d80cb7\n" }, { "commit": "958dab93cde1c05a8ae9cb4cba1acbbce9bced63", "tree": "d74fcd8aff5cfc1bf37c104d1e6670ade5c8fd2a", "parents": [ "aacbdf59d616fd736e0a5041907572a69c175419", "678ba24533139c1e54a9729f3ad9f4614da8fbad" ], "author": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Fri Oct 28 20:13:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 20:13:57 2016 +0000" }, "message": "Merge \"Use UUIDs for call management in Headset Client (HF)\"\nam: 678ba24533\n\nChange-Id: I77553f45f3d5de04e9b443e425f15afb8946e237\n" }, { "commit": "aacbdf59d616fd736e0a5041907572a69c175419", "tree": "40a2a2b018d88fa0a6de5331becdac4a1741ab70", "parents": [ "d0d99d8a3d52a871857b4c5b81225c5dbf6a2d4f", "b32d4f8b5cd5b9c2415e291896b83267e1b4d5fe" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Fri Oct 28 20:09:53 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 28 20:09:55 2016 +0000" }, "message": "Merge \"Modify AIDLs to include Session.Info\" into stage-aosp-master" }, { "commit": "678ba24533139c1e54a9729f3ad9f4614da8fbad", "tree": "9adb042606bed363b16168d8498b7a26160c8df6", "parents": [ "4a4a8f15557e9c0724ec0a7361b7f8d5461f8f33", "52a04e4467dd71c551cc31b4408e55fa805deb92" ], "author": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Fri Oct 28 20:01:58 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 28 20:01:59 2016 +0000" }, "message": "Merge \"Use UUIDs for call management in Headset Client (HF)\"" }, { "commit": "b32d4f8b5cd5b9c2415e291896b83267e1b4d5fe", "tree": "1d9ee1e991b3d12b0d9fadd6cb6307cbc63fad86", "parents": [ "258790a2ea6faa03f8351bea9f5d602665bfebd9" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Mon Oct 24 16:40:49 2016 -0700" }, "committer": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Fri Oct 28 12:14:24 2016 -0700" }, "message": "Modify AIDLs to include Session.Info\n\nModifies the IConnectionService.aidl file to include Session.Info\ninformation to pass from Telecom to Telephony, which is used to start\nexternal Sessions in Telephony from Telecom.\n\nTest: Manual testing and Unit Tests pass\nBug: 26571395\nChange-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b\n" }, { "commit": "52a04e4467dd71c551cc31b4408e55fa805deb92", "tree": "9adb042606bed363b16168d8498b7a26160c8df6", "parents": [ "4a4a8f15557e9c0724ec0a7361b7f8d5461f8f33" ], "author": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Mon Jun 27 20:13:54 2016 -0700" }, "committer": { "name": "Sanket Agarwal", "email": "sanketa@google.com", "time": "Fri Oct 28 18:16:53 2016 +0000" }, "message": "Use UUIDs for call management in Headset Client (HF)\n\nUsing UUIDs that are managed by the service gives more control and error\nhandling in the service since it has control over assigning them.\n\nBug: b/29788044\nChange-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9\n(cherry picked from commit dbeab2c6e12693fe9b06b6a680677da5325c9230)\n(cherry picked from commit 40bb6f3f8fc02600fe24301c11e804196ced3531)\n" }, { "commit": "4aa38633fe2988ef583c05c2e420242d2b774ffa", "tree": "92a30d28485e7cf4bbcef009c00c34e142bb4b97", "parents": [ "0cf19a9a278ba65a7f35e6b5466984d3fb0f27a6", "d0d99d8a3d52a871857b4c5b81225c5dbf6a2d4f" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 28 17:55:12 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 17:55:12 2016 +0000" }, "message": "Merge \"app_process: Forward -cp/-classpath to ART.\" am: 4a4a8f1555\nam: d0d99d8a3d\n\nChange-Id: Ia7bea2370daeb77ab23a797546f8f7c437902516\n" }, { "commit": "d0d99d8a3d52a871857b4c5b81225c5dbf6a2d4f", "tree": "a4cf883776a7a4d86f52058953368be1e3fb85ba", "parents": [ "29d6af7fe7f1aebb3e8630928e2ca4dc253dcc6c", "4a4a8f15557e9c0724ec0a7361b7f8d5461f8f33" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 28 17:48:15 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 17:48:15 2016 +0000" }, "message": "Merge \"app_process: Forward -cp/-classpath to ART.\"\nam: 4a4a8f1555\n\nChange-Id: If7773d6bae3f4f13aa7f0c883b1c20319d85c747\n" }, { "commit": "4a4a8f15557e9c0724ec0a7361b7f8d5461f8f33", "tree": "0204093725b4db071d9efc9b5c35fc7bd166e02b", "parents": [ "ec3e884e8855f3158814eb1e4cec6919b35766d4", "4f66cb3f534eafff335ec803caff0572d08e8aa5" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Oct 28 17:34:46 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 28 17:34:47 2016 +0000" }, "message": "Merge \"app_process: Forward -cp/-classpath to ART.\"" }, { "commit": "0cf19a9a278ba65a7f35e6b5466984d3fb0f27a6", "tree": "65511f6948c2b32a485a99c7b87c8e88040e6fb5", "parents": [ "a657136264fb8acff1290e4d183efe72436c8292", "29d6af7fe7f1aebb3e8630928e2ca4dc253dcc6c" ], "author": { "name": "Przemyslaw Szczepaniak", "email": "pszczepaniak@google.com", "time": "Fri Oct 28 12:15:19 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 12:15:19 2016 +0000" }, "message": "Merge \"Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9\" am: ec3e884e88\nam: 29d6af7fe7\n\nChange-Id: I6693fe79836e88d022d393d2bee5d811cb2dcdfc\n" }, { "commit": "29d6af7fe7f1aebb3e8630928e2ca4dc253dcc6c", "tree": "36ee9b3dc9f22979b7a28625c4c57a566ffbe9e5", "parents": [ "77281bbaf42e2e5bb0e4f174805b3ac45358bf9f", "ec3e884e8855f3158814eb1e4cec6919b35766d4" ], "author": { "name": "Przemyslaw Szczepaniak", "email": "pszczepaniak@google.com", "time": "Fri Oct 28 12:05:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 12:05:56 2016 +0000" }, "message": "Merge \"Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9\"\nam: ec3e884e88\n\nChange-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651\n" }, { "commit": "ec3e884e8855f3158814eb1e4cec6919b35766d4", "tree": "b12ac6f7f5624fd7173bab3244f5b14c82a82470", "parents": [ "87c997ca2180990fcb6e0eda19a42b8b28497c7e", "5753515d3dd346623142899328f8d967a76e722f" ], "author": { "name": "Przemyslaw Szczepaniak", "email": "pszczepaniak@google.com", "time": "Fri Oct 28 11:57:07 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 28 11:57:07 2016 +0000" }, "message": "Merge \"Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9\"" }, { "commit": "a657136264fb8acff1290e4d183efe72436c8292", "tree": "1cad6556f787c3d5688c586b5afbc1f151bd851a", "parents": [ "e1d174053470396b94caad9818c7411f424e1491" ], "author": { "name": "Mitchell Wills", "email": "mwills@google.com", "time": "Wed Aug 31 16:15:37 2016 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Oct 28 06:19:56 2016 +0000" }, "message": "Revert \"DO NOT MERGE Revert \"Add Bluetooth toggle prompts - framework\"\"\n\nThis reverts commit 6a80a4b05acacd3fd07583a3bb6185e9770215eb.\n\nChange-Id: I21fc6802fd3eeca42492e07437bb71d54f015593\n(cherry picked from commit b38028128bb9878971f8b5a85b90b3f303fec0ba)\n" }, { "commit": "e1d174053470396b94caad9818c7411f424e1491", "tree": "412b2105edf755a1f8d5e3a47019a0ed1310ec4d", "parents": [ "61d008892315ac7e1cd6c856f291a79e38900211", "77281bbaf42e2e5bb0e4f174805b3ac45358bf9f" ], "author": { "name": "Mitchell Wills", "email": "mwills@google.com", "time": "Fri Oct 28 04:58:50 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 04:58:50 2016 +0000" }, "message": "Revert \"DO NOT MERGE Revert \"Add Bluetooth toggle prompts - framework\"\"\nam: 77281bbaf4 -s ours\n\nChange-Id: I85645a2301cba10b1612c5ec851412d4e1c6d947\n" }, { "commit": "77281bbaf42e2e5bb0e4f174805b3ac45358bf9f", "tree": "f6c5307fdd42470dccb9c88ccd2150ed2fd67821", "parents": [ "81d5ecb7a684f61b9204ff72c8004735527d7f17" ], "author": { "name": "Mitchell Wills", "email": "mwills@google.com", "time": "Wed Aug 31 16:15:37 2016 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Oct 28 03:52:58 2016 +0000" }, "message": "Revert \"DO NOT MERGE Revert \"Add Bluetooth toggle prompts - framework\"\"\n\nThis reverts commit 6a80a4b05acacd3fd07583a3bb6185e9770215eb.\n\nChange-Id: I21fc6802fd3eeca42492e07437bb71d54f015593\n(cherry picked from commit b38028128bb9878971f8b5a85b90b3f303fec0ba)\n" }, { "commit": "61d008892315ac7e1cd6c856f291a79e38900211", "tree": "412b2105edf755a1f8d5e3a47019a0ed1310ec4d", "parents": [ "7ad32238f667a3de3977a8e66ee775a7a3a535f4", "81d5ecb7a684f61b9204ff72c8004735527d7f17" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Fri Oct 28 02:56:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 02:56:54 2016 +0000" }, "message": "Merge \"Separate LE scanner from GATT client (1/4)\" am: 87c997ca21\nam: 81d5ecb7a6\n\nChange-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6\n" }, { "commit": "7ad32238f667a3de3977a8e66ee775a7a3a535f4", "tree": "8b10ed619d55f308491870bcbe940075d2713c92", "parents": [ "df87eb4adcc98ff49b4136f3526dcbe2fc007329", "98f664b90343125f1d461a346c1b2b9a7bffa6ad" ], "author": { "name": "Marie Janssen", "email": "jamuraa@google.com", "time": "Fri Oct 28 02:52:00 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 02:52:00 2016 +0000" }, "message": "Merge \"Add Bluetooth toggle prompts - framework\" am: a062ce698b -s ours\nam: 98f664b903\n\nChange-Id: I6dabd16f5334e78bc05e6b5ffb95a0177a3cd4d7\n" }, { "commit": "81d5ecb7a684f61b9204ff72c8004735527d7f17", "tree": "142f51f68bdc2e03bf002489ddcdcde63eb02c2f", "parents": [ "98f664b90343125f1d461a346c1b2b9a7bffa6ad", "87c997ca2180990fcb6e0eda19a42b8b28497c7e" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Fri Oct 28 02:50:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 02:50:54 2016 +0000" }, "message": "Merge \"Separate LE scanner from GATT client (1/4)\"\nam: 87c997ca21\n\nChange-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13\n" }, { "commit": "98f664b90343125f1d461a346c1b2b9a7bffa6ad", "tree": "1b376c6df866b35bd90a98ad455f9f0d690a16f1", "parents": [ "258790a2ea6faa03f8351bea9f5d602665bfebd9", "a062ce698b56eeee427652ab5b227afe61bae31e" ], "author": { "name": "Marie Janssen", "email": "jamuraa@google.com", "time": "Fri Oct 28 02:45:26 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Oct 28 02:45:26 2016 +0000" }, "message": "Merge \"Add Bluetooth toggle prompts - framework\"\nam: a062ce698b -s ours\n\nChange-Id: I426b2378c9153286557498fe80c2469caa6a4888\n" }, { "commit": "87c997ca2180990fcb6e0eda19a42b8b28497c7e", "tree": "466a6255fcd3e3cf1aa6dc415a2ab0785df51487", "parents": [ "a062ce698b56eeee427652ab5b227afe61bae31e", "1b49e6eb04f2eef4d8056e7447d8e0789c291847" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Thu Oct 27 23:18:53 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 27 23:18:54 2016 +0000" }, "message": "Merge \"Separate LE scanner from GATT client (1/4)\"" }, { "commit": "3445f829077cea72da77e31f0a2f6ccce3af295b", "tree": "967bea169b0589733a569e2db09361f946c14d02", "parents": [ "a062ce698b56eeee427652ab5b227afe61bae31e" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Mon Oct 24 16:40:49 2016 -0700" }, "committer": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Thu Oct 27 16:11:18 2016 -0700" }, "message": "Modify AIDLs to include Session.Info\n\nModifies the IConnectionService.aidl file to include Session.Info\ninformation to pass from Telecom to Telephony, which is used to start\nexternal Sessions in Telephony from Telecom.\n\nTest: Manual testing and Unit Tests pass\nBug: 26571395\nChange-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b\n" }, { "commit": "1b49e6eb04f2eef4d8056e7447d8e0789c291847", "tree": "466a6255fcd3e3cf1aa6dc415a2ab0785df51487", "parents": [ "a062ce698b56eeee427652ab5b227afe61bae31e" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Oct 26 13:05:30 2016 -0700" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Oct 27 23:09:35 2016 +0000" }, "message": "Separate LE scanner from GATT client (1/4)\n\nRight now, LE scanning functionality is combined with the GATT client.\nThis is the source of various bugs, like scans suddenly stoppinging when\na GATT client is killed. It also increases memory consumption, because\nwe associate many structures with a GATT client, which are not necessary\nwhen just scanning.\n\nTest: sl4a BleScanApiTest ConcurrentBleScanTest\nChange-Id: I0c25bd4a58bb430eb0ee4100d5f2bbab194f9621\n" }, { "commit": "a062ce698b56eeee427652ab5b227afe61bae31e", "tree": "a4845bf9682fb842d907f175beda2be366d7c132", "parents": [ "bd2688f4c3e7a94594c439fdcca976932080932d", "f9e2ad0b3c2efb3bd93bb8b4ce2580512563005a" ], "author": { "name": "Marie Janssen", "email": "jamuraa@google.com", "time": "Thu Oct 27 23:07:31 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 27 23:07:32 2016 +0000" }, "message": "Merge \"Add Bluetooth toggle prompts - framework\"" }, { "commit": "f9e2ad0b3c2efb3bd93bb8b4ce2580512563005a", "tree": "a4845bf9682fb842d907f175beda2be366d7c132", "parents": [ "bd2688f4c3e7a94594c439fdcca976932080932d" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Wed Jun 29 17:31:44 2016 -0700" }, "committer": { "name": "Marie Janssen", "email": "jamuraa@google.com", "time": "Thu Oct 27 22:49:11 2016 +0000" }, "message": "Add Bluetooth toggle prompts - framework\n\nIf permission review is enabled toggling bluetoth on or off\nresults in a user prompt to collect consent. This applies\nonly to legacy apps, i.e. ones that don\u0027t support runtime\npermissions as they target SDK 22.\n\nAlso added a configuration resource which controls whether\npermission review mode is enabled. By default it is not and\nan OEM can change this via an overlay. For now we also keep\nthe old mechanism to toggle review mode via a build property\nwhich is still used and will be removed when clients have\ntransitioned.\n\nbug:28715749\n\nChange-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7\n(cherry picked from commit ac69be543f89ea6e9a27204492e0a170d9b3450e)\n" }, { "commit": "df87eb4adcc98ff49b4136f3526dcbe2fc007329", "tree": "8b10ed619d55f308491870bcbe940075d2713c92", "parents": [ "8d0cdfb291e4c457ceff768185e8c1c96b44d27a", "258790a2ea6faa03f8351bea9f5d602665bfebd9" ], "author": { "name": "Leonard Mosescu", "email": "mosescu@google.com", "time": "Thu Oct 27 17:29:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 27 17:29:24 2016 +0000" }, "message": "Merge \"Merge \"Adding \"attach-agent\" to ActivityManagerShellCommand\" am: bd2688f4c3 -s ours\" into stage-aosp-master\nam: 258790a2ea\n\nChange-Id: I82e68dd1ad007b8962f8ee73de2429dbe3e23959\n" }, { "commit": "8d0cdfb291e4c457ceff768185e8c1c96b44d27a", "tree": "8b10ed619d55f308491870bcbe940075d2713c92", "parents": [ "8c32fd2d33a0ced355d2c7999785621c36b9dc41", "d73688521c018de432e0a59b0c208b75e551930f" ], "author": { "name": "Leonard Mosescu", "email": "mosescu@google.com", "time": "Thu Oct 27 17:29:19 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 27 17:29:19 2016 +0000" }, "message": "Merge \"Adding \"attach-agent\" to ActivityManagerShellCommand\" am: bd2688f4c3 -s ours\nam: d73688521c\n\nChange-Id: I67fdb8dcceb791b5984bba37395a73c3be36a992\n" }, { "commit": "8c32fd2d33a0ced355d2c7999785621c36b9dc41", "tree": "8b10ed619d55f308491870bcbe940075d2713c92", "parents": [ "57ee5d7e9c4ac4bb700188513ee68aac8e3fc8fb", "6e54239e501110a00c31143a3583ce206fc854b4" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Thu Oct 27 17:28:15 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 27 17:28:15 2016 +0000" }, "message": "Extending DNS event reporting\nam: 6e54239e50\n\nChange-Id: I64e6a48fbbaa734447069b073c3499ef71af907c\n" }, { "commit": "258790a2ea6faa03f8351bea9f5d602665bfebd9", "tree": "1b376c6df866b35bd90a98ad455f9f0d690a16f1", "parents": [ "6e54239e501110a00c31143a3583ce206fc854b4", "d73688521c018de432e0a59b0c208b75e551930f" ], "author": { "name": "Android Build Merger (Role)", "email": "android-build-merger@google.com", "time": "Thu Oct 27 17:24:53 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 27 17:24:56 2016 +0000" }, "message": "Merge \"Merge \"Adding \"attach-agent\" to ActivityManagerShellCommand\" am: bd2688f4c3 -s ours\" into stage-aosp-master" }, { "commit": "d73688521c018de432e0a59b0c208b75e551930f", "tree": "2a91b58c67c5cfd2580d8d01440c7606434a550d", "parents": [ "853427a30af3ce02bb7eaf2ff21444820f84ace9", "bd2688f4c3e7a94594c439fdcca976932080932d" ], "author": { "name": "Leonard Mosescu", "email": "mosescu@google.com", "time": "Thu Oct 27 17:24:17 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 27 17:24:17 2016 +0000" }, "message": "Merge \"Adding \"attach-agent\" to ActivityManagerShellCommand\"\nam: bd2688f4c3 -s ours\n\nChange-Id: If1e48ecf5e75452c85e7a36f4be0d817234043c9\n" }, { "commit": "bd2688f4c3e7a94594c439fdcca976932080932d", "tree": "3302e3611521aaa50393cb2fbb0185e05c66ae6b", "parents": [ "d19524f4f2cc3c0dc34559254b537db37fc3376b", "1ab879be90a0d58219fca206e556349709fdfda0" ], "author": { "name": "Leonard Mosescu", "email": "mosescu@google.com", "time": "Thu Oct 27 17:04:57 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 27 17:04:57 2016 +0000" }, "message": "Merge \"Adding \"attach-agent\" to ActivityManagerShellCommand\"" }, { "commit": "1ab879be90a0d58219fca206e556349709fdfda0", "tree": "3302e3611521aaa50393cb2fbb0185e05c66ae6b", "parents": [ "d19524f4f2cc3c0dc34559254b537db37fc3376b" ], "author": { "name": "Leonard Mosescu", "email": "mosescu@google.com", "time": "Thu Oct 06 17:32:05 2016 -0700" }, "committer": { "name": "Leonard Mosescu", "email": "mosescu@google.com", "time": "Thu Oct 27 17:03:57 2016 +0000" }, "message": "Adding \"attach-agent\" to ActivityManagerShellCommand\n\nThis new command is used to attach runtime agents to a running application:\n\nattach-agent \u003cPROCESS\u003e \u003cFILE\u003e\n Attach an agent to the specified \u003cPROCESS\u003e,\n which may be either a process name or a PID.\n\nTest: m test-art-host, manual testing:\n . invalid syntax, missing arguments\n . invalid syntax, extra arguments\n . invalid numeric PID\n . invalid process name\n . valid process, not debuggable\n . valid process, missing agent\n . valid process, valid agent\n\nBug: 31682382\n\nChange-Id: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6\n\nMerged-In: Ife88dbf23991dde7945d9208e54cd014bb7ecdc6\n" }, { "commit": "6e54239e501110a00c31143a3583ce206fc854b4", "tree": "1b376c6df866b35bd90a98ad455f9f0d690a16f1", "parents": [ "853427a30af3ce02bb7eaf2ff21444820f84ace9" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Tue Sep 27 17:13:57 2016 +0100" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Oct 27 16:39:21 2016 +0000" }, "message": "Extending DNS event reporting\n\nThis adds hostname, array of addresses, total count of IP addresses\nand uid to the existing pipeline.\nCurrently ignores the new data it receives, further work will be\ndone in the subsequent CLs.\n\nTest: for now just the benchmarking, in the future unit and CTS\n\nBug: 29748723\nChange-Id: Ice7db208282934e74f0e1808ffbae96d476c4216\n(cherry picked from commit 14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)\n" }, { "commit": "57ee5d7e9c4ac4bb700188513ee68aac8e3fc8fb", "tree": "96ce9a407a639fd508c2108504b22bc839e8925f", "parents": [ "8fba923d2a0b1508faf1fd3fb47e7f36e1c6f8ec", "853427a30af3ce02bb7eaf2ff21444820f84ace9" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Oct 27 13:30:02 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 27 13:30:02 2016 +0000" }, "message": "Merge changes from topic \u0027netd_aosp\u0027 am: d19524f4f2\nam: 853427a30a\n\nChange-Id: I91cce5b10d49573a37504b6664b3ef0d13ae0d77\n" }, { "commit": "8fba923d2a0b1508faf1fd3fb47e7f36e1c6f8ec", "tree": "96ce9a407a639fd508c2108504b22bc839e8925f", "parents": [ "c1ca63e8cb124c6664f68b41eb27950f05a67881", "17be4d6c8584baa66ed8c4962d36166d16a7e153" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Thu Oct 27 13:21:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 27 13:21:37 2016 +0000" }, "message": "Add connect event reporting am: 265494a0f8\nam: 17be4d6c85\n\nChange-Id: I042fdb187af2de08374864867dbd75d8c92c56c9\n" }, { "commit": "853427a30af3ce02bb7eaf2ff21444820f84ace9", "tree": "2a91b58c67c5cfd2580d8d01440c7606434a550d", "parents": [ "17be4d6c8584baa66ed8c4962d36166d16a7e153", "d19524f4f2cc3c0dc34559254b537db37fc3376b" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Oct 27 13:20:34 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 27 13:20:34 2016 +0000" }, "message": "Merge changes from topic \u0027netd_aosp\u0027\nam: d19524f4f2\n\nChange-Id: Ia2b67e53de3b4b734e157b95908b9e4c94360c70\n" }, { "commit": "c1ca63e8cb124c6664f68b41eb27950f05a67881", "tree": "8f61970607ff9119a38019afd8ef6712344beb80", "parents": [ "e6effcd7a6c0d9462066bf464f58d223bc1accd3", "3156b53fbea29e8053aa2ce0f8b25dd593fcabb9" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Thu Oct 27 13:20:31 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 27 13:20:31 2016 +0000" }, "message": "Extending DNS event reporting am: f82d1596ce\nam: 3156b53fbe\n\nChange-Id: I14dfa7508c7115b0e60836b3788c421068b70946\n" }, { "commit": "17be4d6c8584baa66ed8c4962d36166d16a7e153", "tree": "2a91b58c67c5cfd2580d8d01440c7606434a550d", "parents": [ "3156b53fbea29e8053aa2ce0f8b25dd593fcabb9", "265494a0f89fc6724ff09c60f072fdeba6285643" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Thu Oct 27 13:13:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 27 13:13:56 2016 +0000" }, "message": "Add connect event reporting\nam: 265494a0f8\n\nChange-Id: I258d348355ac182cdd0c0698d5dbbb66668dcdd8\n" }, { "commit": "3156b53fbea29e8053aa2ce0f8b25dd593fcabb9", "tree": "e484322c1dc395fb252eb621da9ea0399907263b", "parents": [ "bb8f3a3bbf1db9e2678ed16ae4576ec2f634dad7", "f82d1596ce92e0e8b687b365a9e60661e132b872" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Thu Oct 27 13:12:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Oct 27 13:12:29 2016 +0000" }, "message": "Extending DNS event reporting\nam: f82d1596ce\n\nChange-Id: I2e39caad0074be519640b561201f75d6685c01ef\n" }, { "commit": "d19524f4f2cc3c0dc34559254b537db37fc3376b", "tree": "e9729c0b5412473c4b3134b3117c5ee10071b9e5", "parents": [ "ef0cc6205872fc77da84df3420bca65824c1ad96", "265494a0f89fc6724ff09c60f072fdeba6285643" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Oct 27 13:05:25 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 27 13:05:26 2016 +0000" }, "message": "Merge changes from topic \u0027netd_aosp\u0027\n\n* changes:\n Add connect event reporting\n Extending DNS event reporting\n" }, { "commit": "265494a0f89fc6724ff09c60f072fdeba6285643", "tree": "e9729c0b5412473c4b3134b3117c5ee10071b9e5", "parents": [ "f82d1596ce92e0e8b687b365a9e60661e132b872" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Wed Sep 28 16:06:16 2016 +0100" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Oct 27 18:23:21 2016 +0900" }, "message": "Add connect event reporting\n\nAdds reporting of connect events including netId, destination IP address,\ndestination port, uid and connect latency.\nCurrently ignores the new data it receives, further work will be\ndone in the subsequent CLs.\n\nTest: for now just the benchmarking, in the future CTS\n\nBug: 29748723\n\n(cherry picked from commit 965894eeb90c13255b5559b925d13fd22528f8cb)\n\nChange-Id: I0c563f26ac39a7e1870153f30d073fc7d0006abc\n" }, { "commit": "f82d1596ce92e0e8b687b365a9e60661e132b872", "tree": "ccbb4471390ce5c3239b54c47e858e3b662736cd", "parents": [ "ef0cc6205872fc77da84df3420bca65824c1ad96" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Tue Sep 27 17:13:57 2016 +0100" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Oct 27 18:23:16 2016 +0900" }, "message": "Extending DNS event reporting\n\nThis adds hostname, array of addresses, total count of IP addresses\nand uid to the existing pipeline.\nCurrently ignores the new data it receives, further work will be\ndone in the subsequent CLs.\n\nTest: for now just the benchmarking, in the future unit and CTS\n\n(cherry picked from commit 14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)\n\nBug: 29748723\nChange-Id: Ice7db208282934e74f0e1808ffbae96d476c4216\n" }, { "commit": "e6effcd7a6c0d9462066bf464f58d223bc1accd3", "tree": "eac9e29bc80fea12716765e9508ae8e43ace6fc9", "parents": [ "f300e2f8ff3cae4ce2e4dae6bb91eb6856d8958c", "bb8f3a3bbf1db9e2678ed16ae4576ec2f634dad7" ], "author": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Wed Oct 26 22:44:44 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 22:44:44 2016 +0000" }, "message": "Merge \"wifi: hotspot2: omadm: add parsing support for PPS MO tree\" am: ef0cc62058\nam: bb8f3a3bbf\n\nChange-Id: I935c4b34c1f40e2bba1983161f7900ec9511f8da\n" }, { "commit": "f300e2f8ff3cae4ce2e4dae6bb91eb6856d8958c", "tree": "0a65cf2ec4f2f7271a1e52cbafb02e15fa21c80a", "parents": [ "90e40ee8434351ddde09fcc486957f9f318e2d87", "fe4f473fb8e006d559686080ca4fac6e6af5f6bf" ], "author": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Wed Oct 26 22:43:23 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 22:43:23 2016 +0000" }, "message": "Merge changes I69c1931b,I6b08f52d am: 1a5da2b533\nam: fe4f473fb8\n\nChange-Id: I54e73a4e4f336fc8d4fc5eae55d138a46aee9626\n" }, { "commit": "90e40ee8434351ddde09fcc486957f9f318e2d87", "tree": "0a65cf2ec4f2f7271a1e52cbafb02e15fa21c80a", "parents": [ "47047555bc5824a3543ab79ccd64a83416af6182", "2fb7775d2ad4ac22cbb03113bebd1c32ce2c79ba" ], "author": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Wed Oct 26 22:41:48 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 22:41:48 2016 +0000" }, "message": "wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am: bae4becf69\nam: 2fb7775d2a\n\nChange-Id: Ie6cc6911d6ec49a55f467cfe5e59f218df18455b\n" }, { "commit": "47047555bc5824a3543ab79ccd64a83416af6182", "tree": "57b53213552839580d8faac955914cf65ccd14af", "parents": [ "54501b0dee312d60418d3e6c6ab1bc5d00a4d50a", "6f426e3b174e1a3724010fd595a70437a128f392" ], "author": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Wed Oct 26 22:40:43 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 22:40:43 2016 +0000" }, "message": "wifi: hotspot2: initial implementation of PasspointConfiguration am: e557c35d95\nam: 6f426e3b17\n\nChange-Id: Icb7497670a7137810ed4def6e6b087c56f1c6de9\n" }, { "commit": "bb8f3a3bbf1db9e2678ed16ae4576ec2f634dad7", "tree": "d0055c71233955baf3373d6b5cb21be4dce45a2b", "parents": [ "fe4f473fb8e006d559686080ca4fac6e6af5f6bf", "ef0cc6205872fc77da84df3420bca65824c1ad96" ], "author": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Wed Oct 26 22:30:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 22:30:37 2016 +0000" }, "message": "Merge \"wifi: hotspot2: omadm: add parsing support for PPS MO tree\"\nam: ef0cc62058\n\nChange-Id: Id5b7771a25905d8e8e074b62c6ef70363c459d08\n" }, { "commit": "fe4f473fb8e006d559686080ca4fac6e6af5f6bf", "tree": "624ea37ea378fce71789dd8d85c1daf38635d144", "parents": [ "2fb7775d2ad4ac22cbb03113bebd1c32ce2c79ba", "1a5da2b533940e357f83d2058d39cf87c5ecd428" ], "author": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Wed Oct 26 22:29:01 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 22:29:01 2016 +0000" }, "message": "Merge changes I69c1931b,I6b08f52d\nam: 1a5da2b533\n\nChange-Id: I43b0ddd456cfd9d3988c504266e868a637bb43c4\n" }, { "commit": "2fb7775d2ad4ac22cbb03113bebd1c32ce2c79ba", "tree": "624ea37ea378fce71789dd8d85c1daf38635d144", "parents": [ "6f426e3b174e1a3724010fd595a70437a128f392", "bae4becf6997843cddf0d0c1dfa1f63e4580e6f8" ], "author": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Wed Oct 26 22:28:55 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 22:28:55 2016 +0000" }, "message": "wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string\nam: bae4becf69\n\nChange-Id: I2b8510cc8dc6fad443f0507a86f960ce1ae9a0d6\n" }, { "commit": "6f426e3b174e1a3724010fd595a70437a128f392", "tree": "ab01240a5743e30026bc41481d9beafcfd327c06", "parents": [ "808bd1765fca17fbcd161e92cc7c225ae768ee97", "e557c35d95a8d05c58a592d4c34db69a1dd2c1a7" ], "author": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Wed Oct 26 22:27:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 22:27:56 2016 +0000" }, "message": "wifi: hotspot2: initial implementation of PasspointConfiguration\nam: e557c35d95\n\nChange-Id: I0ece2aef3408de46c2c92b311c78e711c09c99b9\n" }, { "commit": "ef0cc6205872fc77da84df3420bca65824c1ad96", "tree": "d8143ec5dc5e7b6b39a5e1d2c2e039369304d37b", "parents": [ "1a5da2b533940e357f83d2058d39cf87c5ecd428", "2a658a152a220d34990bd9cbf63a58b97c76d3df" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Oct 26 22:14:15 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 26 22:14:15 2016 +0000" }, "message": "Merge \"wifi: hotspot2: omadm: add parsing support for PPS MO tree\"" }, { "commit": "1a5da2b533940e357f83d2058d39cf87c5ecd428", "tree": "d7a7849d698ac64193ae2bf1996f8819bc6786f9", "parents": [ "e266c375598acb4c3f72976485379f6148c9ebcf", "bae4becf6997843cddf0d0c1dfa1f63e4580e6f8" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Oct 26 22:13:57 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 26 22:13:57 2016 +0000" }, "message": "Merge changes I69c1931b,I6b08f52d\n\n* changes:\n wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string\n wifi: hotspot2: initial implementation of PasspointConfiguration\n" }, { "commit": "54501b0dee312d60418d3e6c6ab1bc5d00a4d50a", "tree": "a7eeef3bb318f9df2bc9cf25c7287ec68fe94820", "parents": [ "35207ba65523c1c645d00ee65bc22179b2a4c2fd", "808bd1765fca17fbcd161e92cc7c225ae768ee97" ], "author": { "name": "Dimitry Ivanov", "email": "dimitry@google.com", "time": "Wed Oct 26 20:18:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 20:18:08 2016 +0000" }, "message": "Merge \"Always call into native loader when load a native library\" am: e266c37559\nam: 808bd1765f\n\nChange-Id: I63495e45a1eafe2dd92c30f315289f5ca2d17070\n" }, { "commit": "35207ba65523c1c645d00ee65bc22179b2a4c2fd", "tree": "a7eeef3bb318f9df2bc9cf25c7287ec68fe94820", "parents": [ "ff13cc20fedec05ef969da676b6687cd5ff437e6", "3512d092dd327d98f657bafe5d13a1c8a732af5c" ], "author": { "name": "Dimitry Ivanov", "email": "dimitry@google.com", "time": "Wed Oct 26 20:16:38 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 20:16:38 2016 +0000" }, "message": "Always call into native loader when load a native library am: 569834d861\nam: 3512d092dd\n\nChange-Id: I73a52349387cad474da6cb0d6c664cfb0879e2a6\n" }, { "commit": "ff13cc20fedec05ef969da676b6687cd5ff437e6", "tree": "4cf9dcd39ab2dff193996e5f004e9f8b51f343e5", "parents": [ "bb139c5633dc9fb9f54be75ba0db660e0f8c1110", "bc2af49c21358454c18418ef194a26d15a0d41d5" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Wed Oct 26 20:12:56 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 20:12:56 2016 +0000" }, "message": "resolve merge conflicts of ab00546 to stage-aosp-master\nam: bc2af49c21\n\nChange-Id: I95cfcd3907105ef1969f02bf1229ba0c5eb9b8c7\n" }, { "commit": "808bd1765fca17fbcd161e92cc7c225ae768ee97", "tree": "cd072d7be81b79a189da7687e5426171d2765259", "parents": [ "3512d092dd327d98f657bafe5d13a1c8a732af5c", "e266c375598acb4c3f72976485379f6148c9ebcf" ], "author": { "name": "Dimitry Ivanov", "email": "dimitry@google.com", "time": "Wed Oct 26 20:11:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 20:11:33 2016 +0000" }, "message": "Merge \"Always call into native loader when load a native library\"\nam: e266c37559\n\nChange-Id: I4d220cde19ac85b16396070f493395227a85d82c\n" }, { "commit": "3512d092dd327d98f657bafe5d13a1c8a732af5c", "tree": "cd072d7be81b79a189da7687e5426171d2765259", "parents": [ "bc2af49c21358454c18418ef194a26d15a0d41d5", "569834d86112d8032abb15f60f135544bc101d86" ], "author": { "name": "Dimitry Ivanov", "email": "dimitry@google.com", "time": "Wed Oct 26 20:11:01 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 26 20:11:01 2016 +0000" }, "message": "Always call into native loader when load a native library\nam: 569834d861\n\nChange-Id: I35ce58423aefceb541542e0ef9408e0b7ef9b104\n" }, { "commit": "bc2af49c21358454c18418ef194a26d15a0d41d5", "tree": "44513019358dc467a18bec7650e594597511ef96", "parents": [ "b5fed003cce94a92be1f35a28f35815f2d23b296", "ab005465b6e1ce252c0573ee1ae5917971707df4" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Wed Oct 26 11:24:54 2016 -0700" }, "committer": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Wed Oct 26 12:05:27 2016 -0700" }, "message": "resolve merge conflicts of ab00546 to stage-aosp-master\n\nChange-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49\n" }, { "commit": "2a658a152a220d34990bd9cbf63a58b97c76d3df", "tree": "ad09b6d3bb76c3bfe88723f41649daa30db80e72", "parents": [ "bae4becf6997843cddf0d0c1dfa1f63e4580e6f8" ], "author": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Tue Oct 18 12:04:23 2016 -0700" }, "committer": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Wed Oct 26 11:52:30 2016 -0700" }, "message": "wifi: hotspot2: omadm: add parsing support for PPS MO tree\n\nThis parser will convert a PPS MO (PerProviderSubscription Management Object)\ntree XML string to a PasspointConfiguration parcelable object.\n\nBug: 32129686\nChange-Id: Ia80b6d73828436ded57a3817f5eca7b79c618de4\nTest: frameworks/base/wifi/tests/runtests.sh\n" }, { "commit": "bae4becf6997843cddf0d0c1dfa1f63e4580e6f8", "tree": "076aba935791cf19c1fdea36439499d88642e7f4", "parents": [ "e557c35d95a8d05c58a592d4c34db69a1dd2c1a7" ], "author": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Fri Oct 14 14:26:46 2016 -0700" }, "committer": { "name": "Peter Qiu", "email": "zqiu@google.com", "time": "Wed Oct 26 11:52:24 2016 -0700" }, "message": "wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string\n\nThe XML parser will parse an XML string into a tree-like structure\nrepresented by XMLNode, which will be used by an object specific parser\n(e.g. PerProviderSubscription Management Object tree parser) for further\nprocessing.\n\nBug: 32129686\nTest: frameworks/base/wifi/tests/runtests.sh\n\nChange-Id: I69c1931b2e8a6f3551e4eba5cffa3d2d0877872a\n" }, { "commit": "e266c375598acb4c3f72976485379f6148c9ebcf", "tree": "d0d7a72b5dd6dfa2e2743c1963f7d3ae28a294ce", "parents": [ "ab005465b6e1ce252c0573ee1ae5917971707df4", "569834d86112d8032abb15f60f135544bc101d86" ], "author": { "name": "Dimitry Ivanov", "email": "dimitry@google.com", "time": "Wed Oct 26 18:27:37 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 26 18:27:38 2016 +0000" }, "message": "Merge \"Always call into native loader when load a native library\"" }, { "commit": "ab005465b6e1ce252c0573ee1ae5917971707df4", "tree": "5e28df9ed236fded7ea07e135b4cf59a98046d81", "parents": [ "7f2676a3d954b85af14a15bb81d9c42edf4cfea7", "f2456cb127628f4684442e932f8ed582ffec4910" ], "author": { "name": "Jordan Liu", "email": "jminjie@google.com", "time": "Wed Oct 26 17:50:44 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 26 17:50:45 2016 +0000" }, "message": "Merge \"Add key to CarrierConfigManager\"" } ], "next": "bb139c5633dc9fb9f54be75ba0db660e0f8c1110" }