)]}' { "log": [ { "commit": "191330e4a19175a32adceb790066732771579728", "tree": "bd024d64854da48215116930aada93efe3b34b74", "parents": [ "99cf40a25a23393b7463e9c5f664c4586c5eca48" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Tue Apr 11 11:06:34 2017 -0700" }, "committer": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Mon May 22 22:39:15 2017 -0700" }, "message": "Fix makefile warning.\n\nTest: it builds.\nBug: b/37159108\nChange-Id: I73c09c8eeb0bab5f506c3d81072cc80c71f63779\nMerged-In: I73c09c8eeb0bab5f506c3d81072cc80c71f63779\n" }, { "commit": "fb1ee0ebb2ac9aa3c4e89919079de379375f3e11", "tree": "5b579312f531c8d0783a4b67bd1ac8748f2e2e9a", "parents": [ "73818566d6cdab38b96a9a6dbf773f11b166526c" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu May 11 13:32:32 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Mon May 15 16:48:52 2017 -0700" }, "message": "startStreaming for MBMS apis\n\nClean up MBMS APIs a bit and make things functional for the\nstartStreaming/getPlaybackUri APIs.\n\nTest: testapps\nChange-Id: I141a4114cc912b98ae22aefb760346061e286f1a\n" }, { "commit": "cfe0c2f1ec875280d34cfb790ebd119a2c979858", "tree": "f9873978e475b05c2c5acb744177187ac2e3cfdb", "parents": [ "5669550a8326359449daa5c52cfd167bffb2432e", "bede17c216815a849be0c43d5ce7daaf750a9fac" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu May 04 13:51:38 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu May 04 13:51:39 2017 +0000" }, "message": "Merge \"Time zone update API classes\"" }, { "commit": "bede17c216815a849be0c43d5ce7daaf750a9fac", "tree": "ed0c74ae15f345514a2118de3ba93bce0dfdebd7", "parents": [ "af5f00ee5e6eda69584d90ba96dc4e726cd2e8a2" ], "author": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu Mar 16 18:29:36 2017 +0000" }, "committer": { "name": "Neil Fuller", "email": "nfuller@google.com", "time": "Thu May 04 12:32:53 2017 +0100" }, "message": "Time zone update API classes\n\nTime zone update API classes. Currently hidden but they\nwill go on to be unhidden in future.\n\nThis forms the basis of client and system server code to\nsupport time zone updates.\n\nTests can be run with:\n\nmake -j30 FrameworksCoreTests\nadb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk\nadb shell am instrument -e package android.app.timezone \\\n -w com.android.frameworks.coretests \\\n \"com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner\"\n\nBug: 31008728\nTest: See above.\nMerged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833\nChange-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1\n" }, { "commit": "563e150c2d806f2c616851d19de8b3d6dbfb699f", "tree": "0f86a2de399000fbb5fb4667664cfd5876a0ab32", "parents": [ "1be8fb23eb9cb3414c1436a672b3a2d60abb2fef" ], "author": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Tue Apr 25 15:04:26 2017 -0700" }, "committer": { "name": "Hall Liu", "email": "hallliu@google.com", "time": "Thu Apr 27 19:43:11 2017 -0700" }, "message": "eMBMS API update\n\nBrings eMBMS APIs into alignment with the architecture doc.\nAll APIs are hidden for now.\n\nTest: builds\nChange-Id: I6e692bd363f998d1cd8f80faa72bde71ffe8fd2e\n" }, { "commit": "89e10d3eb4a4728ffdb5a5eba76d772d28bcb855", "tree": "84a8a4a9a7d6e47542e4bb0df3967efab8ceb116", "parents": [ "21b9b3a8ffddde5044b428b086bbb601318d231b" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Apr 19 05:44:34 2017 -0700" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Apr 24 15:42:57 2017 +0000" }, "message": "Get rid of the IAdvertiserCallabck\n\nBug: 30622771\nTest: none\nChange-Id: I2c55f96e71cd3be67f88201ab07c91730cd85971\n" }, { "commit": "4dded7a1b5a7ff6ed7402a9c2c512e4751421d7f", "tree": "02bd122d76cb4e3e0da4f864c4a64d5bbd8966d0", "parents": [ "a070e55e341c03efc3c340d6ab4fad93cb4ab449" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Mon Dec 05 16:33:32 2016 -0800" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Thu Apr 20 12:17:37 2017 -0700" }, "message": "Second pass of eMBMS api.\n\nUpdating Streaming apis. Adding midwear aidl files.\nUpdating Download apis.\nMaking it Compile..\n\nTest: none yet\nChange-Id: I3f44ef3f6690274af1dc2002bc02e6668fe23248\n" }, { "commit": "c8d846ffefed5e80fa77f4aa7cb7d13e78b39787", "tree": "886ce11078eb86474c257e543fc9c5f6ebeff556", "parents": [ "fe358c6adfb67afe42071f94ccad3d9e4a920f34" ], "author": { "name": "Jaewan Kim", "email": "jaewan@google.com", "time": "Fri Feb 03 16:21:38 2017 +0900" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Tue Apr 18 20:16:13 2017 +0000" }, "message": "Add callback for AVRCP 1.6 support\n\nBug: 33828042\nTest: Build\nChange-Id: Iaf5cecfa38065cfeed096929952559d7cb2e248b\n" }, { "commit": "4fdc7d5ddd05658deec383790f63477df355f3fb", "tree": "f9a92c96b6f9d77f04e424e338417c6fddc71dde", "parents": [ "25105f65617d4afd2b0059a0520026eeb95f7744", "ce073d70bedc47876da1644fca59864c669d34af" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Wed Mar 29 16:03:34 2017 -0700" }, "committer": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Wed Mar 29 16:04:31 2017 -0700" }, "message": "Merge commit \u0027ce073d70bedc\u0027 into stage-aosp-master\n\nChange-Id: I319034a5b77de5cf71de0e110bb17819fb907f1b\n" }, { "commit": "1afbef40c68373f3871eed087c546cfe1911ee36", "tree": "f5e1c8f76b1f4b5fee2937867a5ca34f07a43e71", "parents": [ "5d81b9d67d73be37f51900dde72041e4eb230263" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Wed Mar 01 18:55:06 2017 -0800" }, "committer": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Wed Mar 29 11:31:27 2017 -0700" }, "message": "Add a Skeleton IpSecService\n\n-Add IpSecService with the necessary glue to connect to netd\n-Add code to retrieve IpSecService from System Server\n\nBug: 34811227\nTest: Service boots (and dumpsys works), more via b/34811227\nMerged-In: I4cdcb643421141202f77a0e2f87a37012de0cd92\nChange-Id: I4cdcb643421141202f77a0e2f87a37012de0cd92\n" }, { "commit": "cfe099b01d676357a44c6fbfe3bd646319e97300", "tree": "0e4360b11c8e17f002636a6e2d50278717bd6158", "parents": [ "3f26682252c924ecd845f09a0bf1977b1da58242", "beb8ceada8f44a8fefaf8fea3ff916850d915296" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Mon Mar 27 21:22:15 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Mar 27 21:22:15 2017 +0000" }, "message": "Merge \"Bluetooth GATT callback naming fix \"Ext\" -\u003e \"\" (1/2)\"\nam: beb8ceada8\n\nChange-Id: Ie88e330a1d50adac8c6b83581079c6096c4d898a\n" }, { "commit": "d7116bea0698f58e93003d2046411a2624dd1ab1", "tree": "529a095af3e385e8259c124c60d23c20412c6546", "parents": [ "a1e206a335f5050618564d2129fbc2bcd0e20730" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Mon Mar 27 12:14:40 2017 -0700" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Mar 27 19:27:57 2017 +0000" }, "message": "Bluetooth GATT callback naming fix \"Ext\" -\u003e \"\" (1/2)\n\nGatt callback don\u0027t need the \"Ext\" postfix, as it was removed from new\nAPI.\n\nTest: manual\nBug: 30622771\nChange-Id: I54596ffdcb818343cc313123266cfa16291c6236\n" }, { "commit": "fc3c9d0e9ec7db80b8e139a5306247908c923ccc", "tree": "afcddae581c8920674913bb55b42885dfb6061f7", "parents": [ "4f6034160c625525543e8e2b933c3dac539e04f2", "1bb08c25b8c1657be36b57fbf39aeeee14bc3724" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Mar 08 19:21:03 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Mar 08 19:21:03 2017 +0000" }, "message": "Merge \"Bluetooth 5 Advertising API\"\nam: 1bb08c25b8\n\nChange-Id: Ifd95aacf025929d3c9f5a1762f31ed20c26fabfd\n" }, { "commit": "4f6034160c625525543e8e2b933c3dac539e04f2", "tree": "84cd562a5467478a3db3de336501d5785b827cd7", "parents": [ "8acd7391bdcbf560c1a5137731887f2631e1b27d", "104eeedb42d8de557056c0f70018c5d4fa8f6540" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Mar 08 19:18:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Mar 08 19:18:50 2017 +0000" }, "message": "Merge \"Bluetooth 5 PHY selection API\"\nam: 104eeedb42\n\nChange-Id: I0ee2daaf0771b405c8a14598a70459879d31c953\n" }, { "commit": "8acd7391bdcbf560c1a5137731887f2631e1b27d", "tree": "565793dac531ad9c31648dae1a4205fc50e227f5", "parents": [ "71760b71fd6403f84c6c14dc8c980a053357f37a", "f1d76a71c8a4170da4b06e71b98c190dc18d500b" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Mar 08 19:14:22 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Mar 08 19:14:22 2017 +0000" }, "message": "Merge \"Bluetooth 5 periodc scan API (1/2)\"\nam: f1d76a71c8\n\nChange-Id: I7b68746e3dc02a12d13380a90bcf26cebfd31f16\n" }, { "commit": "a9d1a32e5e51ebc3c141370c9d5045c6c938aaf9", "tree": "3bd35731d8a36b738fb06452c160842458e576e7", "parents": [ "104eeedb42d8de557056c0f70018c5d4fa8f6540" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Tue Jan 10 06:15:54 2017 -0800" }, "committer": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Mar 08 19:04:49 2017 +0000" }, "message": "Bluetooth 5 Advertising API\n\nTest: manual\nBug: 30622771\nChange-Id: Id6856e6110872ec50ff1af54ddc75c0104a6459c\n(cherry picked from commit 5324a14cf490656269ef862d7f8f6b139a21c0e6)\n" }, { "commit": "409cee69b2b09bcd11f1273752c016116436f247", "tree": "15ca5e9f185d5e9a0ccf91c1e2bfc0285e0ed073", "parents": [ "f1d76a71c8a4170da4b06e71b98c190dc18d500b" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Thu Feb 02 08:07:12 2017 -0800" }, "committer": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Mar 08 19:04:06 2017 +0000" }, "message": "Bluetooth 5 PHY selection API\n\nBug: 30622771\nTest: manual\nChange-Id: I50262a56a70466439f9700549c3c0e7bd49e2e8d\n(cherry picked from commit db5a87d50db9d4b3d642603f6c329b83ee5851f6)\n" }, { "commit": "ac7fcfa36160f1ce8b1ba8e0a3a90338a99a02a4", "tree": "8e6592e542450f2bf9294ba84558829c11c7d0d3", "parents": [ "bed6fb3f5aee1413738a83cee7790cbfc4393fdc" ], "author": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Mon Jan 16 07:21:01 2017 -0800" }, "committer": { "name": "Jakub Pawlowski", "email": "jpawlowski@google.com", "time": "Wed Mar 08 19:03:12 2017 +0000" }, "message": "Bluetooth 5 periodc scan API (1/2)\n\nBug: 30622771\nTest: manual\nChange-Id: I61853bc71f6013e9406d1d151bb51ea4484bb92c\n(cherry picked from commit a48e03745becc96181c676dc3d194d0572f11c10)\n" }, { "commit": "3c2c2764d4b141ee835b7c0725022e9af77c83a9", "tree": "dfe6c8998651225e6451b7551d70a07895f97b0e", "parents": [ "4896a04013a97a41564b0a68685cc559bc81fcca", "313e645801e561dbf25320110ab4790a33720dae" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Feb 17 22:25:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Feb 17 22:25:53 2017 +0000" }, "message": "Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2\nam: 313e645801\n\nChange-Id: Ia10d20ea4ebabc2cc84524950dec7570104b185f\n" }, { "commit": "313e645801e561dbf25320110ab4790a33720dae", "tree": "64ccd7f6d68c3c4e09425790275f6833e8d1ec54", "parents": [ "855889b086ab62255b13cb7eb3783ae5e95ee492", "254a418e97e02f43d1f25ea801d67e1bdf498d65" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Feb 17 21:44:21 2017 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 17 21:44:21 2017 +0000" }, "message": "Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2\n\n* changes:\n Enable multidex for SystemUITests\n Add missing transitive dependencies\n Revert \"Remove support of disabling Jack.\"\n" }, { "commit": "c9c8b590c5d51b54a84824270be49ddc16fd2a71", "tree": "8529edd7e9d1181235c62c2bf17cf42b4f716bb9", "parents": [ "2dc835dd1ca183103f069fdb85ec9e3548d1b3c2", "f46aa6f9eea39df7f0a9528d78b8687f2e0e5b63" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Fri Feb 17 20:29:13 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Feb 17 20:29:13 2017 +0000" }, "message": "Merge \"Adds @hide ImsService APIs\" am: 2b879016d3\nam: f46aa6f9ee\n\nChange-Id: I12e10d796a7b2d56cacf8e9b53bb5e228b79ecc3\n" }, { "commit": "be2d3307e23f08bbc29e1b33b6aba9c7d05a5867", "tree": "8ce1604900d34f98860b49d0e9723bb541ebc647", "parents": [ "97ebc29e9c3afb65394be27c09ab42ca7d32c602" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Dec 21 16:48:32 2016 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Feb 16 11:41:42 2017 -0800" }, "message": "Revert \"Remove support of disabling Jack.\"\n\nThis reverts commit ba068f48727dee2223b3be3b0359accb949e363d.\n\nTest: builds\nChange-Id: I2c4d64e26c2e4ceb710a39de2ee9749160d33a72\n" }, { "commit": "1639c21be6e7cd7699db4080fcf2ccc5cb2006e6", "tree": "00eb626935a8066011289e7cc54e37bb52a10318", "parents": [ "eb82e3de8777414e722dca06039e477eea3a0cdd" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Wed Jan 25 14:26:41 2017 -0800" }, "committer": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Thu Feb 16 11:14:26 2017 -0800" }, "message": "Adds @hide ImsService APIs\n\nAdds @hide ImsService API implementations to be used for the new\ndynamic ImsResolver.\n\n1) ImsService - The main class that all vendor ImsServices will implement.\nImsServices that implement this method must return their implementations\nof MMTelFeature when onCreateMMTelFeature is called. The base ImsService\nclass also relays all method calls through itself as a proxy. So, when\nTelephony calls a method, the ImsService figures out which MMTelFeature\nshould be called (by slot) and then calls that feature\u0027s method\nimplementation.\n\n2) MMTelFeature/RcsFeature - Implements the I*Feature interfaces, which\nare used on both sides of the interface. The vendor implemented ImsService\nmust implement all methods provided in the I*Feature interface in their\nimplementation of *Feature that they return to the ImsService.\n\n3) ImsServiceProxy[Compat] - The Proxy interface in telephony that will be\ncalled in ImsManager. When a method in this class is called, it will call\nthe respective AIDL function: Telephony -\u003e IImsServiceController AIDL -\u003e\nvendor ImsService -\u003e vendor ImsFeature implementation.\nImsServiceProxyCompat is there to provide backwards compatibility with\nolder ImsServices that do not use the new ImsService implementations.\nIt implements all of the methods that are defined in the new I*Feature\ninterfaces and translates them to the old ImsService AIDL calls.\n\nTest: Adds Unit Tests (see frameworks/opt/telephony)\nMerged-In: Id3466c178384158c788ab1d708ab108bb95866fc\nChange-Id: Id3466c178384158c788ab1d708ab108bb95866fc\n" }, { "commit": "ded1df24e01b7317593bbec84724b10f5444d5d9", "tree": "6a5ca2a99db381d7558e8dc799c3b39ad3cee351", "parents": [ "7fef16ff248051b57433186f14db04d8cf070628", "2741442324618804cca953e30251864142e6302d" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Thu Jan 26 01:49:53 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jan 26 01:49:53 2017 +0000" }, "message": "Merge \"Adding Dynamic ImsService Binding (1/3)\" am: 8e6b13a1c0 am: 64057ab972\nam: 2741442324\n\nChange-Id: Ibd5c988226e7994c332a7e7f8b40a9338cf84e0f\n" }, { "commit": "2741442324618804cca953e30251864142e6302d", "tree": "73cc677fcff49d36e8f903d96e16a2112700bd89", "parents": [ "a07e5312ccc21dffbfeecee17e5c859e0cb952d1", "64057ab972674ac0105af9e3a7003416f9a9c823" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Thu Jan 26 01:46:06 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jan 26 01:46:06 2017 +0000" }, "message": "Merge \"Adding Dynamic ImsService Binding (1/3)\" am: 8e6b13a1c0\nam: 64057ab972\n\nChange-Id: I901c72a38b522c190e849de55078036adc80d8b6\n" }, { "commit": "64057ab972674ac0105af9e3a7003416f9a9c823", "tree": "667f891c9608c66bbf5de259f0ddc6f424a178f2", "parents": [ "e80181055327812d83b73fe0357bebce156af3b1", "8e6b13a1c0e969b00d6b6e29fd367082be071ff9" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Thu Jan 26 01:41:38 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jan 26 01:41:38 2017 +0000" }, "message": "Merge \"Adding Dynamic ImsService Binding (1/3)\"\nam: 8e6b13a1c0\n\nChange-Id: I8534273da5579b7662e66f80a60348a4665dd65b\n" }, { "commit": "024aaf23881c142ba92194a001ac038253ae708e", "tree": "d0017aaa47e767a9dcf823f556604186509f417b", "parents": [ "6d064d8780c4626d033c26fd87242080a2f1c768" ], "author": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Mon Jan 23 15:17:50 2017 -0800" }, "committer": { "name": "Brad Ebinger", "email": "breadley@google.com", "time": "Wed Jan 25 15:12:28 2017 -0800" }, "message": "Adding Dynamic ImsService Binding (1/3)\n\nAdds support for dynamic ImsService Binding (change 1/3). Included\nin this change:\n- AIDLs for ImsServiceController\n- ImsFeature/ImsServiceBase definitions\n- KEY_CONFIG_IMS_PACKAGE_OVERRIDE CarrierConfig option\n\nTest: Unit Tests in opt/telephony\nBug: 30290416\nChange-Id: Ic4cb1d85a29681b08a6a525c588a72209862dcc3\n" }, { "commit": "389b853bc88fd77a7dceecbb9fb02c0c05d90e6a", "tree": "5b04e5c30c0f3bdc4e38b7da6060841c844adfbc", "parents": [ "1fee3a64b7c673364a6288068fff5fd049b7e9b4" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Dec 02 12:17:21 2016 -0700" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Wed Jan 18 19:08:35 2017 +0900" }, "message": "DO NOT MERGE: Switch over to new \"time.android.com\" NTP pool.\n\nAlso add logging to measure success/failure details.\n\nTest: builds, boots, and NTP fix obtained\nBug: 32969463\n\n(cherry picked from commit d3f689bf14a05de735b5cc92dcf20e7226c78690)\n\n(cherry picked from commit dda938a698a17b2943bbe78f6631a26dedabf28a)\n\nChange-Id: I67e4f54f8f2ec69b6522fbbe06ef196b1084f44a\n" }, { "commit": "48738f5ad07b71066a74766a3a066dd10c45f027", "tree": "30fdc95d18104f0c9af0f428c2706ff12fd6d477", "parents": [ "a9c92c2442db2775173136148f09f8e93385543e", "91ab2e2f983eddee138bd7f577c5659e0e610fdc" ], "author": { "name": "Ivan Podogov", "email": "ginkage@google.com", "time": "Thu Dec 29 20:00:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 29 20:00:09 2016 +0000" }, "message": "Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5 am: 94e3d3f499\nam: 91ab2e2f98\n\nChange-Id: If0e072e96491020191a7742928cc90adff151342\n" }, { "commit": "a9c92c2442db2775173136148f09f8e93385543e", "tree": "d904538910482bdc82a9dfda5bf14ebe22b6d5c6", "parents": [ "b5a5a516237a42c17df9366cbf7e6a2b2c8465d1", "1ee22b7f7050db257572d9c1a2cb0355c2881c6c" ], "author": { "name": "Hemant Gupta", "email": "hemantg@codeaurora.org", "time": "Thu Dec 29 19:59:28 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 29 19:59:28 2016 +0000" }, "message": "Bluetooth: Add support for HID Device Role am: e88fd4b594 am: ee469c6fe9\nam: 1ee22b7f70\n\nChange-Id: Ia82f834d4d2ad800574bb0317f4fb3b3786972fc\n" }, { "commit": "91ab2e2f983eddee138bd7f577c5659e0e610fdc", "tree": "63a0300734cb0f697eda19c25c675c3b7b230e7a", "parents": [ "1ee22b7f7050db257572d9c1a2cb0355c2881c6c", "94e3d3f499b8e6eaf25db3dc4975004960043081" ], "author": { "name": "Ivan Podogov", "email": "ginkage@google.com", "time": "Thu Dec 29 19:46:55 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 29 19:46:55 2016 +0000" }, "message": "Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5\nam: 94e3d3f499\n\nChange-Id: I97ff93fd2564bd76d90095f8086f79c6c6086aff\n" }, { "commit": "1ee22b7f7050db257572d9c1a2cb0355c2881c6c", "tree": "93462dcbc558e1014fd83ff947672b5075b11c28", "parents": [ "2c29250b443d1ed263889a19453d3d462c7fbc24", "ee469c6fe9a91877fa9427bc5135cbec20fe1af6" ], "author": { "name": "Hemant Gupta", "email": "hemantg@codeaurora.org", "time": "Thu Dec 29 19:46:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 29 19:46:08 2016 +0000" }, "message": "Bluetooth: Add support for HID Device Role am: e88fd4b594\nam: ee469c6fe9\n\nChange-Id: Ic48911d254671d402f5a6b8198109f28e6497036\n" }, { "commit": "94e3d3f499b8e6eaf25db3dc4975004960043081", "tree": "0934e86c3008070d8f10f684dab47945167f0d4a", "parents": [ "ee469c6fe9a91877fa9427bc5135cbec20fe1af6", "0afe190af52d83c5e52fa994e53c48e33e8e3bf4" ], "author": { "name": "Ivan Podogov", "email": "ginkage@google.com", "time": "Thu Dec 29 19:38:41 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 29 19:38:41 2016 +0000" }, "message": "Rename the Bluetooth profile classes for HID Device role.\nam: 0afe190af5\n\nChange-Id: Ib5c9b904da57048d719df504142edd3dab0e6ec3\n" }, { "commit": "ee469c6fe9a91877fa9427bc5135cbec20fe1af6", "tree": "388e201c216cd4686a527ebd208c8ca27bc0e9e1", "parents": [ "fd770e1cb8e08accb3b3fb0f79af1336a1ec86ed", "e88fd4b5940a855e961cffa36e93f844a44cd2d4" ], "author": { "name": "Hemant Gupta", "email": "hemantg@codeaurora.org", "time": "Thu Dec 29 19:37:58 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 29 19:37:58 2016 +0000" }, "message": "Bluetooth: Add support for HID Device Role\nam: e88fd4b594\n\nChange-Id: Ic2a82d5670ffbd3046766d73ed9b180546c59169\n" }, { "commit": "0afe190af52d83c5e52fa994e53c48e33e8e3bf4", "tree": "9160d8c5818a628916337193a9cc377506be9227", "parents": [ "e88fd4b5940a855e961cffa36e93f844a44cd2d4" ], "author": { "name": "Ivan Podogov", "email": "ginkage@google.com", "time": "Fri Dec 23 11:52:21 2016 +0000" }, "committer": { "name": "Myles Watson", "email": "mylesgw@google.com", "time": "Thu Dec 29 14:30:40 2016 +0000" }, "message": "Rename the Bluetooth profile classes for HID Device role.\n\nWe already have BluetoothInputDevice class, so adding something\ncalled BluetoothHidDevice seems confusing. On the other hand,\nthe new class is designed to connect to HID Host devices, so\nnaming it BluetoothInputHost makes sense and goes in line with\nthe existing BluetoothInputDevice.\n\nThe same goes for the new constant HID_DEVICE that is just as\nconfusing to have together with the INPUT_DEVICE one.\n\nThis CL also renames the \"connection state changed\" broadcast\n(for the same reasons), declares it as an SDK constant, and also\nadds some javadoc to it.\n\nNote that BluetoothHidDeviceApp* classes remained unchanged, as\nthose correspond to the app that implements the Device (and\nconnects to the Host).\n\nTest: make\nChange-Id: I5075ca5b97db3c1dd403c2e9660eecc7380cffe2\n" }, { "commit": "e88fd4b5940a855e961cffa36e93f844a44cd2d4", "tree": "dd494f6a65e8a1edd003041ffde2ec6301ea5426", "parents": [ "895e2d7a405e9224515b6564ab4700aad3b0abf1" ], "author": { "name": "Hemant Gupta", "email": "hemantg@codeaurora.org", "time": "Fri Apr 18 11:22:45 2014 +0530" }, "committer": { "name": "Myles Watson", "email": "mylesgw@google.com", "time": "Thu Dec 29 14:29:53 2016 +0000" }, "message": "Bluetooth: Add support for HID Device Role\n\nThis patch adds the HID Device Role support in Bluetooth framework.\nAlso AIDL and callback related files for HID Device role are added\nto provide interface for third party applications to communicate with\nHID Device Service.\n\nChange-Id: Id03a362b7bcfa2e76056fa0197eaac12ce49b5a2\n" }, { "commit": "e9be5d908d32d67db9968a9ff12c37b579149bf7", "tree": "3569cd4f77ade93ad673e71ab766720bdb734bfe", "parents": [ "61a967a3f07f5b78737d6fffb93e88c950ac8ad6", "c3650beee54c4406d307449548738c78d56fd099" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Dec 14 15:15:51 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 14 15:15:51 2016 +0000" }, "message": "Copy core-junit files into legacy-test. am: cd7c34d8bf am: 98e609d556\nam: c3650beee5\n\nChange-Id: I04560b5982651d175a268056f32eb36980ef2259\n" }, { "commit": "c3650beee54c4406d307449548738c78d56fd099", "tree": "72d06da6cb2c0a8a6e21d7d472d9626635bc23b2", "parents": [ "49a848e46fcf30d768c677546dfe32fdc84509e0", "98e609d55607e4ff0c669398d33ab45ba31d6153" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Dec 14 15:09:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 14 15:09:22 2016 +0000" }, "message": "Copy core-junit files into legacy-test. am: cd7c34d8bf\nam: 98e609d556\n\nChange-Id: I4eb422f8fe217e5528e632d1f85c1303604b0d64\n" }, { "commit": "98e609d55607e4ff0c669398d33ab45ba31d6153", "tree": "1b6307ebe004e8c3ea8b427c2d56214127785aaa", "parents": [ "5d53a925a17b0629e1e8ddded614a88554b2f92a", "cd7c34d8bf4302e640c742d7bb94107cc1505aff" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Dec 14 15:02:16 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 14 15:02:16 2016 +0000" }, "message": "Copy core-junit files into legacy-test.\nam: cd7c34d8bf\n\nChange-Id: I672fa4b006b04db5a4c8f86793f1c891bc55754a\n" }, { "commit": "cd7c34d8bf4302e640c742d7bb94107cc1505aff", "tree": "6cdb06c518b7dcff1be867ce2a86bf5e20ccd4e3", "parents": [ "3e24af3eb760afafdc1a704a0c3e9f42db2e6475" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Dec 12 16:35:36 2016 +0000" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Dec 14 14:19:08 2016 +0000" }, "message": "Copy core-junit files into legacy-test.\n\nThe legacy-test directory contains part of the Android API and\nso must maintain backwards compatibility. The junit classes that\nare in the API are copied here to ensure that they do not change\nwhen external/junit is upgraded.\n\nBug: 30188076\nTest: make checkbuild and checked legacy-test contents\nChange-Id: I6c263afc16c06abfd027334be51a41422239a189\n" }, { "commit": "d1c710d5cff55b632e91d95cdba158bbc3879bc8", "tree": "7d60dd7d5534a00dfd9fa666c74eded24a628f7a", "parents": [ "b2e8690507f64f935d20a7ce75cefbaf6cf2c160", "4c47adef60ca0326bdbe124dfdd335382e5c0787" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Wed Dec 14 10:51:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 14 10:51:33 2016 +0000" }, "message": "DO NOT MERGE [DPM] Management and retrieval of network logs\nam: 4c47adef60\n\nChange-Id: I39486c9d6116023f1ee9bd576b7fcd0fe20023a1\n" }, { "commit": "b2e8690507f64f935d20a7ce75cefbaf6cf2c160", "tree": "b24164c2c50011d024ad3decd4b7f8b03f4a0578", "parents": [ "7efe982f0f92e679209e7cd2cd5b39e8958c7e73", "c3abd34cfed63d5b71366901d19f6d9cd8319306" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Wed Dec 14 10:50:36 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 14 10:50:36 2016 +0000" }, "message": "DO NOT MERGE [DPM] DO can start network logging and listen for events\nam: c3abd34cfe\n\nChange-Id: I7952d67d22a141040f3ee3ac2b6c3aa2cfccbbf7\n" }, { "commit": "4c47adef60ca0326bdbe124dfdd335382e5c0787", "tree": "88884ded0fe7a064c3f8da5baeb532ee87f6676b", "parents": [ "c3abd34cfed63d5b71366901d19f6d9cd8319306" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Wed Oct 12 16:40:06 2016 +0100" }, "committer": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Tue Dec 13 17:19:22 2016 +0000" }, "message": "DO NOT MERGE [DPM] Management and retrieval of network logs\n\nThis CL follows up on ag/1530343 and adds:\n1) Various network events.\n2) Retrieval method in DPM and APIs in DeviceAdminReceiver.\n3) Extension of NetworkLogger and it\u0027s NetworkLoggingHandler.\n\nTest: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java\nBug: 29748723\nChange-Id: I42a1a477e7c75c109a3982f809c22732b814e8b2\n" }, { "commit": "c3abd34cfed63d5b71366901d19f6d9cd8319306", "tree": "4d70254c61562222b7e993ca80e0c9a77c3603e4", "parents": [ "c5700918aae3e8dee10418adfa9f3439724787d5" ], "author": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Wed Oct 12 14:59:26 2016 +0100" }, "committer": { "name": "Michal Karpinski", "email": "mkarpinski@google.com", "time": "Tue Dec 13 17:15:38 2016 +0000" }, "message": "DO NOT MERGE [DPM] DO can start network logging and listen for events\n\nThis CL adds:\n1) Setter and getter in DPM to manipulate logging switch (retrieval\nmethod to come in a subsequent CL(s)).\n2) A way for DPM to register to listen for events.\n3) Skeleton of NetworkLogger class (more to come in subsequent CL(s)).\n\nBug: 29748723\nChange-Id: I5c04662ccc6febd2ba294b0eaca1ed1da9c16e47\n" }, { "commit": "9ff67746e60ce9e49d7c21e2af087c081873c544", "tree": "ba26df0b146b2aef763d994b0487f5313dbb6405", "parents": [ "6952303c285028ba00c76f10865fa518eaca9dd2", "104fd011b22b62e7bf45ccbd82b4d9537631e7c7" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Sat Dec 10 23:07:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Dec 10 23:07:59 2016 +0000" }, "message": "Merge \"Final push of installd to Binder; goodbye socket!\" am: 1950377f91\nam: 104fd011b2\n\nChange-Id: I4b2ae2329e8842def8682199c5ee8544c22c2be4\n" }, { "commit": "104fd011b22b62e7bf45ccbd82b4d9537631e7c7", "tree": "850824aa556500bdf01611b7a4308e4fac192b1f", "parents": [ "dc017c4e49a8c9899d2115d7a2a519107a83aa67", "1950377f9163c1bd84832c960bbed73b31c2fe85" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Sat Dec 10 23:01:59 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Dec 10 23:01:59 2016 +0000" }, "message": "Merge \"Final push of installd to Binder; goodbye socket!\"\nam: 1950377f91\n\nChange-Id: If10d4f4aafa68b78ddd9a98e8699fe008bbda49b\n" }, { "commit": "740f523b2571d1c4eb4a954e1faedea45dd7fa53", "tree": "dc80945193278aee84829e99139af8e336c68cb4", "parents": [ "d7b144a5e9dc1d4eead6ee3b66afd63b4bec8c67" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Dec 09 14:31:26 2016 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Dec 09 15:30:34 2016 -0700" }, "message": "Final push of installd to Binder; goodbye socket!\n\nMove last two straggling installd commands to Binder and destroy the\nsocket-based communication channel forever.\n\nTest: builds, boots, apps install fine, pre-OTA dexopt works\nBug: 13758960, 30944031\nChange-Id: I9afb9f71858febde34a94f53839b2986493b68a0\n" }, { "commit": "7e28011feabb613cbff3e28ae8134f6190f9dba3", "tree": "fc24cf5b109ab0269f7d13748d978241873a3efc", "parents": [ "accb2854d1037703d82167af5c4393e628835e87", "28b617bdea359addf8057213abef4b6c5ac02495" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Fri Dec 09 15:10:10 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Dec 09 15:10:10 2016 +0000" }, "message": "Merge \"Move android.test classes from core/java to legacy-test/src\" am: 2761ed124a\nam: 28b617bdea\n\nChange-Id: I83a6ce6c329e7eb18ee90689682c30d4a73d7f8e\n" }, { "commit": "28b617bdea359addf8057213abef4b6c5ac02495", "tree": "902ebc36f01f87b336c0dbe72ee509ba409f5088", "parents": [ "4180078d0df0ef7205847d03f07fd7c160dbd1e2", "2761ed124ad7e54a99d70078121229ce942075a0" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Fri Dec 09 15:05:06 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Dec 09 15:05:06 2016 +0000" }, "message": "Merge \"Move android.test classes from core/java to legacy-test/src\"\nam: 2761ed124a\n\nChange-Id: I0009b93ff096456d7f5fd5f83e71fd4b9bff31db\n" }, { "commit": "2761ed124ad7e54a99d70078121229ce942075a0", "tree": "f9e1b928bafb46ea6319e57886da5909acc86c7f", "parents": [ "a44c833042ded18df5c1779396f74282b61f9a33", "df2576045e0edbed05bf4511e0e9ba1038b8f3bb" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Fri Dec 09 14:56:37 2016 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 09 14:56:37 2016 +0000" }, "message": "Merge \"Move android.test classes from core/java to legacy-test/src\"" }, { "commit": "dda938a698a17b2943bbe78f6631a26dedabf28a", "tree": "01359931c5903022e34e6159263ef20911253a0c", "parents": [ "dadf6caf9f2a8c360203a3f141a8c1366159ec4d" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri Dec 02 12:17:21 2016 -0700" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Dec 09 13:59:18 2016 +0900" }, "message": "DO NOT MERGE: Switch over to new \"time.android.com\" NTP pool.\n\nAlso add logging to measure success/failure details.\n\nTest: builds, boots, and NTP fix obtained\nBug: 32969463\n\n(cherry picked from commit d3f689bf14a05de735b5cc92dcf20e7226c78690)\n\nChange-Id: I7da416099ae903fd92beb516251ef4e51673eecf\n" }, { "commit": "df2576045e0edbed05bf4511e0e9ba1038b8f3bb", "tree": "c2f71972c597a374f97425ab16fcc26471140cff", "parents": [ "b92aa5bdfde63e56f1e1e63fbe913638c440ffba" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Nov 30 13:29:39 2016 +0000" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Dec 08 14:55:35 2016 +0000" }, "message": "Move android.test classes from core/java to legacy-test/src\n\n(cherry picked from 2395179afb2ea957a9ba66404021c14160361611)\n\nBug: 30188076\nTest: make checkbuild\nMerged-In: Ifa291909fcf47da788627b496bd72f54efd78ed7\nChange-Id: Ie20dceb9f89df245ed6da5fc2fb06185bd7b104b\n" }, { "commit": "33e8de479ab373767ef38de24c17aec326281c52", "tree": "926160bea7dbf453c5a5bb2fca9d4111c732621d", "parents": [ "d917e23bbb8bda95f9ce512b1446f15926868454", "2b57c69e258f4f5254c1c42d4241aaac7df6654c" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Wed Dec 07 00:05:29 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Dec 07 00:05:29 2016 +0000" }, "message": "Merge \"API for requesting network recommendations.\" am: 800a4e753e\nam: 2b57c69e25\n\nChange-Id: I8f2357942919193a22e97e4f1d9ec415b736565c\n" }, { "commit": "2b57c69e258f4f5254c1c42d4241aaac7df6654c", "tree": "35a57c84d9810438a92cb7036cab3bba96580a5b", "parents": [ "19426fef23de12470599f84261632d20f2944b10", "800a4e753e991ea23b4c72568b3150b8c232aa6a" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Dec 06 23:58:13 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Dec 06 23:58:13 2016 +0000" }, "message": "Merge \"API for requesting network recommendations.\"\nam: 800a4e753e\n\nChange-Id: Icda431682a283051d4f5f5052dc70b8ab8e01dc9\n" }, { "commit": "82834baa358f55acb542e17da828b2d497cf8332", "tree": "35a57c84d9810438a92cb7036cab3bba96580a5b", "parents": [ "800a4e753e991ea23b4c72568b3150b8c232aa6a", "5b9b0db9f8532aea7c907d3f5ac8b7808b46c1c7" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Dec 06 15:17:16 2016 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Dec 06 15:17:16 2016 -0800" }, "message": "Merge remote-tracking branch \u0027goog/stage-aosp-master\u0027 into HEAD\n" }, { "commit": "d1daf6d22aeb502c0f94261f3421999c2da6ee51", "tree": "9eebc755d44107d1a83cf96a9b9f66b54a7f7492", "parents": [ "9600df035b9994ae481dd7ce0335241b752f7034" ], "author": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Mon Nov 28 17:47:35 2016 -0800" }, "committer": { "name": "Jeremy Joslin", "email": "jjoslin@google.com", "time": "Tue Dec 06 12:48:30 2016 -0800" }, "message": "API for requesting network recommendations.\n\nDefining a new system API that will allow the system to request\nnetwork recommendations from a NetworkScoreService implementation.\n\nTest: Coming in a future CL.\nBUG: 32909424\nMerged-In: I2d5c0a843b928b04e87c1862a78702a02fd54c31\nChange-Id: Idd33095c6cd2f5b391796c900399f18a2c40fcc3\n" }, { "commit": "783096f02ccfa181285eb0cc9020e6f2c4a07904", "tree": "a49b875ad4eb2985a036934e4511b517852ad151", "parents": [ "e5a3ad23fd4d6aa1c7c93cf284f038bccabb6309", "a485fa1fcee62325f3d69b6694e537825310f78e" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Nov 30 12:20:11 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 30 12:20:11 2016 +0000" }, "message": "Merge \"Add legacy-test as replacement for core-junit\" am: e75a82a92f\nam: a485fa1fce\n\nChange-Id: I578b109bc0a4f8655643dad1092b46296ff18114\n" }, { "commit": "a485fa1fcee62325f3d69b6694e537825310f78e", "tree": "64f778ad34fd79aa65e7d1a9189186565449c3a1", "parents": [ "15df815e1e3f38e60deed5e1c1678710e41491bb", "e75a82a92fd6de5ba746eeb9a64be49433384bef" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Wed Nov 30 12:15:14 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Nov 30 12:15:14 2016 +0000" }, "message": "Merge \"Add legacy-test as replacement for core-junit\"\nam: e75a82a92f\n\nChange-Id: Ifa6b4d9c968878e956ddff71a607af67a84472e6\n" }, { "commit": "e20f193a8c2249fdcc5229412dbb570a4035c4c7", "tree": "919ec0c8d0b6cdb1048e2f3b503f31c08221d184", "parents": [ "6063357ae69f29c415591b173cf411f241f129c6" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Nov 28 15:51:09 2016 +0000" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Nov 29 15:04:00 2016 +0000" }, "message": "Add legacy-test as replacement for core-junit\n\nStatically includes core-junit-static into legacy-test target so\nthat legacy-test can be used in place of core-test. Once that\nswitch over has been done then android.test classes that are\nbeing removed from the public API can be safely moved into here.\n\nBug: 30188076\nTest: make legacy-test and check contents of generated legacy-test artifacts\n\nChange-Id: I75488303067c4ac34c46279bfce9a51273adcc34\n" }, { "commit": "a99a05982e181f079c0cdb63f753f1677bc55b4a", "tree": "089975e8b4f3a80cc96915a8de4e048ff1a688b6", "parents": [ "e1166dd4881d8fc5f045e8e16941e26616ab774f", "65710071018141fecd0346ed09e53c262939e54c" ], "author": { "name": "Etan Cohen", "email": "etancohen@google.com", "time": "Sun Nov 06 03:21:37 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Nov 06 03:21:37 2016 +0000" }, "message": "Merge \"[NAN-AWARE] Rename NAN to Aware\" am: 74b1131cc8\nam: 6571007101\n\nChange-Id: Ief54b313dc5ca5d30645b55ed2ad0333036a1671\n" }, { "commit": "65710071018141fecd0346ed09e53c262939e54c", "tree": "2721d6b5a3232d0a67d2aaa2edcae18c6444ed80", "parents": [ "e81eb613996c5f8e0564137bd6bbe759ea218d45", "74b1131cc820f817ece95eef2aa96f7181acdd95" ], "author": { "name": "Etan Cohen", "email": "etancohen@google.com", "time": "Sun Nov 06 03:13:31 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sun Nov 06 03:13:31 2016 +0000" }, "message": "Merge \"[NAN-AWARE] Rename NAN to Aware\"\nam: 74b1131cc8\n\nChange-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf\n" }, { "commit": "0849ded00879dc05175c079011aa038c5ba0770a", "tree": "19718427dfbe6a605d34817950923f7ecf8d3e7d", "parents": [ "c5c74f9f495e6501c38801ab65e985c8457df7e7" ], "author": { "name": "Etan Cohen", "email": "etancohen@google.com", "time": "Wed Oct 26 11:22:06 2016 -0700" }, "committer": { "name": "Etan Cohen", "email": "etancohen@google.com", "time": "Sat Nov 05 09:41:38 2016 -0700" }, "message": "[NAN-AWARE] Rename NAN to Aware\n\n~Rename only (and any reformatting needed to pass lint) - no\nfunctional changes!\n\nRemove android.net.wifi.nan.STATE_CHANGED from manifest:\nredundant/remnant of an older configuration.\n\n(cherry-pick of commit a61b9fb569153917a650f1d48efa20ba8846a9f3)\n\nBug: 32263750\nTest: All unit tests and integration (sl4a) tests pass.\nMerged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614\nChange-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc\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": "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": "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": "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": "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": "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": "f9516473d585360d74cd1297aa7da76194b2036e", "tree": "56bdc28ea15d94ad8b189518c3c09b515fb9bb8f", "parents": [ "4e959b483908fcfd9b92e4ef8e5729fec206ee86", "a3c7c8883fc569f6b46c253fd7f547e50d0a6a8b" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Sat Oct 15 00:21:16 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Oct 15 00:21:16 2016 +0000" }, "message": "Add API 25 to @since list. am: 3376f5893f\nam: a3c7c8883f\n\nChange-Id: I19088f473a1110f16307b1ac49234ee58cbb3d03\n" }, { "commit": "3376f5893f12cf0eec3088f727c58a968c1220c5", "tree": "5ff7be6693b5b5c4fd82faed7ec8fda88ede6bc8", "parents": [ "c8358bfe6531bc55220f509d156d881d5f56c0df" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Oct 14 10:27:08 2016 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Oct 14 10:27:08 2016 -0700" }, "message": "Add API 25 to @since list.\n\nChange-Id: I636c8e948530d4aa3900496f042f54beb57da15a\n" }, { "commit": "9d569636303856a2eddc43297f64991758a456be", "tree": "f8a6bd4911b16ac0f674c048be6532fdb7a39b15", "parents": [ "653c7a528d12c0617588f9d7662344039b4b7a90", "18b725ac0a3e9d3b8dec2d3145e55c890f4f6ab3" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Tue Sep 27 20:59:00 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 27 20:59:00 2016 +0000" }, "message": "[DO NOT MERGE] Use tokens instead of account access trackers am: 32bfb594af\nam: 18b725ac0a\n\nChange-Id: I8f90fb4c4d4baa29727d84a28db68f277d305a74\n" }, { "commit": "18b725ac0a3e9d3b8dec2d3145e55c890f4f6ab3", "tree": "33b0f66b25f234c903874a98d90c41d4e4ff147a", "parents": [ "36c387ab749aabc5345070b282c0ec0cfb112986", "32bfb594af7f5dc0be608393200060458cd84631" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Tue Sep 27 20:51:28 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 27 20:51:28 2016 +0000" }, "message": "[DO NOT MERGE] Use tokens instead of account access trackers\nam: 32bfb594af\n\nChange-Id: I1706ecca7b3b98a2a38483545270941ce8899939\n" }, { "commit": "5c07d0c2eeffddfe69013b84849f29186cb3c0bd", "tree": "e521efb0476728098246735cd6e78ef3964ce01a", "parents": [ "f52c849083a6a3f3f23ea3aa26327d9492518ce3", "32bfb594af7f5dc0be608393200060458cd84631" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 27 20:45:46 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 27 20:45:48 2016 +0000" }, "message": "Merge \"[DO NOT MERGE] Use tokens instead of account access trackers\" into nyc-mr1-dev" }, { "commit": "a056abf598ce6a1baac1e34e4117638e1d638965", "tree": "25c787c892f7aabceaf16d6594a8c2117e22d855", "parents": [ "19b45e16c02c883bbe19ed0e4c12412736c8f7c0", "d32abed1afdf0da5e43fa7f48413d9d14cbebbe0" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Tue Sep 27 17:28:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 27 17:28:54 2016 +0000" }, "message": "add source.properties file to the offline docs build which is required to get this in the SDK Manager am: 2f2365de4a\nam: d32abed1af\n\nChange-Id: I9d6f6f9ce302b3c87d7aac19e6e97cd8a0024f98\n" }, { "commit": "6b860feb421319d3dc2c524a389c5ca9c60b9d19", "tree": "0e584d50a0678ed51173a6640caa42d58fd7d8d3", "parents": [ "a6af4c94223241e64ff18aee09dfb70a14088b92", "6ed77be41de4449e51b19a2a7d2a9c2611c8c328" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Tue Sep 27 17:28:53 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 27 17:28:53 2016 +0000" }, "message": "add source.properties file to the offline docs build which is required to get this in the SDK Manager am: 2f2365de4a\nam: 6ed77be41d\n\nChange-Id: I24b8c286fa94c6c27eb9e9fe67b0d38cd17f5544\n" }, { "commit": "d32abed1afdf0da5e43fa7f48413d9d14cbebbe0", "tree": "9a06a99c42a64211facddf37e058075882c7574b", "parents": [ "49d903dac48af198f8247cd1266d50446a82023a", "2f2365de4a339d37af00055556d6d643175453b8" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Tue Sep 27 17:23:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 27 17:23:54 2016 +0000" }, "message": "add source.properties file to the offline docs build which is required to get this in the SDK Manager\nam: 2f2365de4a\n\nChange-Id: I7a5261a043d803fdc0ac6b916708e0f743b31865\n" }, { "commit": "6ed77be41de4449e51b19a2a7d2a9c2611c8c328", "tree": "0b653e68355f35330d30c318135c771d44f28891", "parents": [ "7b6cebcaa2b4fa413a3121d2c466dcd654acc573", "2f2365de4a339d37af00055556d6d643175453b8" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Tue Sep 27 17:23:54 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 27 17:23:54 2016 +0000" }, "message": "add source.properties file to the offline docs build which is required to get this in the SDK Manager\nam: 2f2365de4a\n\nChange-Id: I15b5ea8a37ec7c718d23db14baed6c8ffb0af13c\n" }, { "commit": "c4108d2f2486b24315f1acc926661cad46847280", "tree": "2ab78676571ccacccd3ad1b4ce378f676f3fc9ea", "parents": [ "7fa6ab7f9a9eefb62ba42f5ed96029382cfab486", "5e7dd0999e629e0a9a714fb29d08d16edf45a117" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Sep 26 10:11:57 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 26 10:11:57 2016 +0000" }, "message": "Merge \"Remove (now) unnecessary reference to core-lambda-stubs.\" am: 68e91852c3 am: c1d97c9250\nam: 5e7dd0999e\n\nChange-Id: I45e2c290cbed1fcf917d54f6a50a60bfa7540f44\n" }, { "commit": "5e7dd0999e629e0a9a714fb29d08d16edf45a117", "tree": "6426556c3928a183ea3e5b99ead43a07f66bc2b6", "parents": [ "3c94a1c56cbc188cf84039c1880e64e0a3492951", "c1d97c92500b81f1eb5b867409ca1b48d5130da9" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Sep 26 10:07:19 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Sep 26 10:07:19 2016 +0000" }, "message": "Merge \"Remove (now) unnecessary reference to core-lambda-stubs.\" am: 68e91852c3\nam: c1d97c9250\n\nChange-Id: I7eb80947c4a0170af7e6af4f878f3d15c8587949\n" }, { "commit": "32bfb594af7f5dc0be608393200060458cd84631", "tree": "f54f7acdb6c9dc87c876a3e3bda08814737bd778", "parents": [ "c3fddb984c9bca51c0df3a528764cbb817627850" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Fri Sep 23 21:30:19 2016 -0700" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Sat Sep 24 06:00:14 2016 +0000" }, "message": "[DO NOT MERGE] Use tokens instead of account access trackers\n\nWe keep track which process saw and account to whitelist\nthe app for future access as an optimization to avoid\nprompting the user for account access approval. Some apps\nuse SefeParcelable where the parcels are marshalled\nwhich does not allow the parcel to contain IBinders.\nTo avoid this we are switching from account tracker remote\nobjects to unforgeable tokens.\n\nbug:31162498\n\nChange-Id: I3b52bff720655f695ad0c58d420eb35ef93161b9\n" }, { "commit": "0daeac5dd41f136a1ca0a76b406016b05586e562", "tree": "46ab57b8278de45af8c4a54ab0d1a255df5e8836", "parents": [ "fccdc49982ffd0d4e34bf6af18ec0dd9e1a40e59", "3a353a2044c1636fd337b2b199a757e066f8a6f9" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Sep 23 03:54:06 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 23 03:54:06 2016 +0000" }, "message": "New IpConnectivityMetrics service am: eab511b582\nam: 3a353a2044\n\nChange-Id: I5cf485edd3ab1ebb81a2a9d35dfb8bd6d8bcc305\n" }, { "commit": "2090e9222c64a4509ebe17faf4a8a212c570c60c", "tree": "d98bd0b1c1e0b128f9abc41175dfb2b1be158d24", "parents": [ "5706a8f5353218a60d3cf104a03e79fae301c27d" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Sep 22 17:50:23 2016 +0100" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Sep 22 17:52:37 2016 +0100" }, "message": "Remove (now) unnecessary reference to core-lambda-stubs.\n\nTis now included in core-oj.\n\nbug: 31675876\nTest: make checkbuild\nChange-Id: If9062a55ec02fe653542dcb4a41020c8e1f6f15e\n" }, { "commit": "eab511b582cc00364dee7835534bb511719f9231", "tree": "e5ba8226191b15e2b6a44011c4ef52a0f68e712f", "parents": [ "50a84c6210f4f165b489dd1bf1c535d86dda2fba" ], "author": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Fri Sep 09 09:23:47 2016 +0900" }, "committer": { "name": "Hugo Benichi", "email": "hugobenichi@google.com", "time": "Thu Sep 22 22:25:27 2016 +0900" }, "message": "New IpConnectivityMetrics service\n\nThis patch defines a new metrics service for IpConnectivity events\ndefined in android.net.metrics, separate from currently existing\nMetricsLoggerService.\n\nSimilarly to MetricsLoggerService, the new service has an event buffer.\nIt also implements a dumpsys interface that can be used to flush events\nand output a serialized proto.\n\nBug: 31254800\nChange-Id: I0c3faeb4008b283f85d9ba9460371fa68956ea3b\n" }, { "commit": "2f2365de4a339d37af00055556d6d643175453b8", "tree": "83cb7c1e08ac2eb25dfa4f0fa4198ceffdfec406", "parents": [ "011172a73187ebdf50041809a98101432a191a52" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Wed Sep 21 14:05:50 2016 -0700" }, "committer": { "name": "smain@google.com", "email": "smain@google.com", "time": "Wed Sep 21 16:26:41 2016 -0700" }, "message": "add source.properties file to the offline docs build\nwhich is required to get this in the SDK Manager\n\nChange-Id: If53cdedcb8f5910fe37add44168348c9fd14d0cb\n" }, { "commit": "b7f1a665b53a8f79d81d718459fc44525b4766dd", "tree": "421fb4ac98963a46939bd8ac2319f9634581c1d7", "parents": [ "683bc64b6b52453f889ae510ce7c1ca1872cd15d", "ad864c8fd9fc3d3c6caa01543bf655efa2e5c14a" ], "author": { "name": "Etan Cohen", "email": "etancohen@google.com", "time": "Tue Sep 20 17:07:31 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 20 17:07:31 2016 +0000" }, "message": "Merge \"[NAN] Rename to make discovery explicit\" am: 5706a8f535 am: eb4c838c46\nam: ad864c8fd9\n\nChange-Id: I338cd7ddf54997bdf19a95056e5793103ffc2e23\n" }, { "commit": "ad864c8fd9fc3d3c6caa01543bf655efa2e5c14a", "tree": "85d4db41c2247466d84721406fdaec6a6cefd9fc", "parents": [ "6d2cca0f43399c14190c76223644ee84996d4936", "eb4c838c469fc63e54ee4768bd90b7051f771c97" ], "author": { "name": "Etan Cohen", "email": "etancohen@google.com", "time": "Tue Sep 20 16:58:32 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 20 16:58:32 2016 +0000" }, "message": "Merge \"[NAN] Rename to make discovery explicit\" am: 5706a8f535\nam: eb4c838c46\n\nChange-Id: Ie03f1e3fbead74c4de77758163ad911e68e54b90\n" }, { "commit": "3855370c24b575e0943a9a3c146fda980cd71e24", "tree": "683fb442158c6034a00af23c3d80c399862e36be", "parents": [ "0027ddf990c657d3db8c1179cc2cad2dfe19f79f" ], "author": { "name": "Etan Cohen", "email": "etancohen@google.com", "time": "Wed Sep 14 14:41:56 2016 -0700" }, "committer": { "name": "Etan Cohen", "email": "etancohen@google.com", "time": "Mon Sep 19 21:52:14 2016 +0000" }, "message": "[NAN] Rename to make discovery explicit\n\nPure rename operation - no other functional changes.\n\n(cherry-pick of commit ddb5f646562f31d7e78778a978e546f85312b009)\n\nBug: 31470256\nTest: unit tests, integrated (sl4a) tests.\nChange-Id: I5110d1a673b7ba4e39350d723b5984586fec585a\n" }, { "commit": "b63d9d8aad137e7e1648e2579a35e6bd50aea944", "tree": "66c928c9811871b03d3896e9fe05860050ac7d07", "parents": [ "110357c0b3337f45771a7301dbe25d7134a25ee0", "33684f217be9e33af6050fb22371b7f783245093" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Sat Sep 17 00:24:10 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Sep 17 00:24:10 2016 +0000" }, "message": "Add build target for generating navtree json with all inherited members. am: 7d47b55cc0\nam: 33684f217b\n\nChange-Id: I34040be694eb1c82b2feb977c6389890d7755d0d\n" }, { "commit": "3776a3253f726c7de5ad11cf123dadc12ec58d55", "tree": "ef4942d01886dda7ad560ef1cb13ece9d2df9e0c", "parents": [ "84e7f80b4d58f390174a5698bc14aef211c14082", "e444205930933fdf6cddcd77a6ba7f83a20b8f24" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Sat Sep 17 00:14:04 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Sep 17 00:14:04 2016 +0000" }, "message": "Add build target for generating navtree json with all inherited members. am: 7d47b55cc0\nam: e444205930\n\nChange-Id: I9aafdf69cf9e0f29d6367a0dacfef53f5147a2cf\n" }, { "commit": "33684f217be9e33af6050fb22371b7f783245093", "tree": "d23d5632df634262e5a4dd86f93aea41c26104f5", "parents": [ "4ef51f592364f8e82a41abe1d7fec7c57ac89bad", "7d47b55cc04953c003026310cf0e8eaeddd7487b" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Sep 16 23:58:02 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 16 23:58:02 2016 +0000" }, "message": "Add build target for generating navtree json with all inherited members.\nam: 7d47b55cc0\n\nChange-Id: Ib9279dc1ec2149a535f4b7a4843612da6af27650\n" }, { "commit": "e444205930933fdf6cddcd77a6ba7f83a20b8f24", "tree": "f09ccb11c98c3ad3c610a1695edc23d0cb5ba299", "parents": [ "2d352ba036261eb5f152841756aff3118982c394", "7d47b55cc04953c003026310cf0e8eaeddd7487b" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri Sep 16 23:56:51 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 16 23:56:51 2016 +0000" }, "message": "Add build target for generating navtree json with all inherited members.\nam: 7d47b55cc0\n\nChange-Id: I66a805e871a9501bd5d19587dbc004be0cfd01d0\n" }, { "commit": "7d47b55cc04953c003026310cf0e8eaeddd7487b", "tree": "715748d024247740f49ff1e562a51507545d79f0", "parents": [ "034401cfaf7cca456c0f027529ee9f7c5fd16996" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Tue Sep 13 16:44:25 2016 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Tue Sep 13 16:44:25 2016 -0700" }, "message": "Add build target for generating navtree json with all inherited members.\n\nChange-Id: I142e848b5288d92e14445025705ea7596e635b6b\n" }, { "commit": "7580351e9e1222ae20a18862fcf9a551be3b0bf1", "tree": "7f318f411f155df1408889f78ec9955dc9933f86", "parents": [ "b21bbfd03939493e8841bd3358cb5536d037275a", "f56f70365d957c3d781110edbb4dbf48dd4c5726" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Fri Sep 09 02:42:23 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 09 02:42:23 2016 +0000" }, "message": "[DO NOT MERGE] While-list apps to access account if already saw it am: 91d37f43c7\nam: f56f70365d\n\nChange-Id: I3a553a7efe34feb9fbfa5d5c504874a2780bf132\n" }, { "commit": "91d37f43c73d76a54679bb84a71a6339bccb1e24", "tree": "d2e6e804f07d7726abbc1841b2753fc0c8ac3661", "parents": [ "220aadbf9ff3f79fae318b77fde45af9c361bcac" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Sat Sep 03 19:36:26 2016 -0700" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Sep 08 16:46:46 2016 -0700" }, "message": "[DO NOT MERGE] While-list apps to access account if already saw it\n\nSync adapters without an account access cannot run until the\nuser approves the account access (for the case the account\naccess is not allowed by other policy such as being singed\nwith the same cert as the authenticator). However, if the\nsync adapter package already got the account from another\napp which means it already saw the account we white-list\nthe sync adapter app to access the account as it already\nsaw it - the bird is out of the cage.\n\nbug:31162498\n\nChange-Id: I2b72f3b0d6307561ed68db2f2e9c900b15e8d098\n" }, { "commit": "689dc4a1fe78b8e4a26ec0732a4fb18b797d545e", "tree": "9424dea26b56eee49d705423321e40a10d393b36", "parents": [ "0025fe5a0bc54f93f7e3cc800f4f252b5d324f0b", "7dd974924671715501b53efb90e3e116d436d966" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Tue Sep 06 18:13:01 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 06 18:13:01 2016 +0000" }, "message": "remove \u0027useUpdatedTemplates\u0027 flag that\u0027s no longer supported. Fix build.\nam: 7dd9749246\n\nChange-Id: I112bec6d8618a116c8abab0751849e12253e298c\n" }, { "commit": "343e96ccacf1da9532cd4cf969b13f22a407a839", "tree": "c6e55f1dfb32d116ce98b06fe25b8e2e02348340", "parents": [ "b65497357862453f3c34ef63fc3fb193b002fea2", "534bfe1a4ab9a13894f48c3c92ce9d5d8ce70d2b" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Tue Sep 06 18:08:10 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Sep 06 18:08:10 2016 +0000" }, "message": "switch all API builds to use template-sdk instead of (soon to be deleted) templates-sdk-dev. also update all non-DAC builds to use the \"referenceonly\" flag for a cleaner output and faster build.\nam: 534bfe1a4a\n\nChange-Id: Ie221252d7cc058d118ac53f3c74ea9c62a077536\n" }, { "commit": "f6b5cde9d9b671dba20be223a73ffd1829b480dd", "tree": "875568bcd06d16bfdab8930d54d5db1bdf4193ee", "parents": [ "11f2fa58c1bff5fecff28e8c665f5cf8b5940303", "1696dcd4b4ba3a5a99907e3d6136e596be203dec" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Sat Sep 03 01:36:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Sep 03 01:36:24 2016 +0000" }, "message": "remove \u0027useUpdatedTemplates\u0027 flag that\u0027s no longer supported. Fix build. am: 7dd9749246 am: ff8cb50979 am: 3578867216\nam: 1696dcd4b4\n\nChange-Id: Ib752a8fc535b7856b0881c79d306c33026f3f5ee\n" }, { "commit": "ff8cb509798b3e0fc18f2eaf5fa2218fa4573cb6", "tree": "49ea6e24d06efe52bf760247edca64e07224590a", "parents": [ "995138bb1c2ba6396db1beede7279601b0377674", "7dd974924671715501b53efb90e3e116d436d966" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Sat Sep 03 01:19:05 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Sep 03 01:19:05 2016 +0000" }, "message": "remove \u0027useUpdatedTemplates\u0027 flag that\u0027s no longer supported. Fix build.\nam: 7dd9749246\n\nChange-Id: I5a048d040dd040f40d0b5e30ea67e62de4cf7259\n" }, { "commit": "7dd974924671715501b53efb90e3e116d436d966", "tree": "9b94a607e76ad6eaf37f935a883e8f4ef7ed3bd9", "parents": [ "460b9c08e6b549533b95ba117dcd6ed53ba4cf26" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Fri Sep 02 18:10:29 2016 -0700" }, "committer": { "name": "smain@google.com", "email": "smain@google.com", "time": "Fri Sep 02 18:10:29 2016 -0700" }, "message": "remove \u0027useUpdatedTemplates\u0027 flag that\u0027s no longer supported. Fix build.\n\nChange-Id: Ic1778b6e3044c80e602f5ce9d4f825c8578c1a0a\n" }, { "commit": "893867044b7adda9e5ab57c55dffd1280491355a", "tree": "bf9cc8ef29463226e2cc8986f9b263322feef6e2", "parents": [ "812bd82c63254220d1ab0083b7d08987c394997e", "3552190ba37c61a28f71d1a89917c3d371a0eca6" ], "author": { "name": "smain@google.com", "email": "smain@google.com", "time": "Fri Sep 02 22:05:24 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Sep 02 22:05:24 2016 +0000" }, "message": "switch all API builds to use template-sdk instead of (soon to be deleted) templates-sdk-dev. also update all non-DAC builds to use the \"referenceonly\" flag for a cleaner output and faster build. am: 534bfe1a4a am: 63f29277bc am: 7ed5e42567\nam: 3552190ba3\n\nChange-Id: I40e7ef517807b0ba5cb9d60045a0125380b218e6\n" } ], "next": "63f29277bcd64f8e0b0681fa18b29fa8ce799e23" }