)]}' { "log": [ { "commit": "20d79203be49ad3140ef5ad4f5be7018cc249a05", "tree": "098bf5c10974112a148645e2ea07750e4d6bd7cd", "parents": [ "11bdbd114582d0dec39fc0e767326f2ae1a1161a", "8ac1bff7e23ac984568652e1c5e9ffc7dd47e341" ], "author": { "name": "Nancy Zheng", "email": "nzheng@google.com", "time": "Mon Jan 23 21:32:28 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jan 23 21:32:28 2017 +0000" }, "message": "Merge \"Query for the settings package in KeyguardManager instead of hardcoding it.\" into cw-f-dev\nam: 8ac1bff7e2\n\nChange-Id: I2e4f9b4ea73ff5d0491b8cfda889a57aaac413ff\n" }, { "commit": "11bdbd114582d0dec39fc0e767326f2ae1a1161a", "tree": "098bf5c10974112a148645e2ea07750e4d6bd7cd", "parents": [ "40758bb7d21a7de8e1f2feba91c6078ca277a744", "e256a18dcd8c0fda68abc5005c405eb8a5c18bea" ], "author": { "name": "Nancy Zheng", "email": "nzheng@google.com", "time": "Mon Jan 23 21:32:26 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Jan 23 21:32:26 2017 +0000" }, "message": "Query for the settings package in KeyguardManager instead of hardcoding it.\nam: e256a18dcd\n\nChange-Id: I3eb7f475c44f815ad2f0e8e1f85c39e555774fcc\n" }, { "commit": "8ac1bff7e23ac984568652e1c5e9ffc7dd47e341", "tree": "26b76bf41699a8c435aa441a3de95bdbb272c4f1", "parents": [ "e710a6fc6663048e0c3302c085a409aa1045a21a", "e256a18dcd8c0fda68abc5005c405eb8a5c18bea" ], "author": { "name": "Nancy Zheng", "email": "nzheng@google.com", "time": "Mon Jan 23 21:17:15 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jan 23 21:17:19 2017 +0000" }, "message": "Merge \"Query for the settings package in KeyguardManager instead of hardcoding it.\" into cw-f-dev" }, { "commit": "40758bb7d21a7de8e1f2feba91c6078ca277a744", "tree": "fde4be7c91e1696ef96c9aea231222d5d93c3361", "parents": [ "96701d3c941b060917d54d29f40ce354f04f94d5", "c78569cc23c7c77542d36694eee0750dee88e989" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Jan 22 00:50:15 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Jan 22 00:50:20 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev" }, { "commit": "96701d3c941b060917d54d29f40ce354f04f94d5", "tree": "1565e3b3a84f157331d9494e11b04e7f3fcecf0b", "parents": [ "f60d275a4551a762a3e32f0d37699b2955988cd3", "7eefc3ed2a2b389d361a2ba39be6b0c7a3dc11b9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Jan 22 00:49:12 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Jan 22 00:49:16 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev" }, { "commit": "f60d275a4551a762a3e32f0d37699b2955988cd3", "tree": "92b9783e9ff3860561f6f702128fd4349e8713e3", "parents": [ "e1a7e67dc0d7ae4d4bf93b86b95e674495704bd3" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Jan 21 13:29:01 2017 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Jan 21 13:29:01 2017 -0800" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I62a808a76324482f44009f4ab8cf5916ba2f0477\nAuto-generated-cl: translation import\n" }, { "commit": "7eefc3ed2a2b389d361a2ba39be6b0c7a3dc11b9", "tree": "72316243dfc3134d8aaa9d0904fec788f6ab9440", "parents": [ "e1a7e67dc0d7ae4d4bf93b86b95e674495704bd3" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Jan 21 11:57:08 2017 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Jan 21 11:57:08 2017 -0800" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I5784ba9ac936cab4b2d809ff49d4e070c039cebe\nAuto-generated-cl: translation import\n" }, { "commit": "c78569cc23c7c77542d36694eee0750dee88e989", "tree": "44d9475c444164c04110f2fd379bbc57823919fb", "parents": [ "e1a7e67dc0d7ae4d4bf93b86b95e674495704bd3" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Jan 21 11:48:44 2017 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Sat Jan 21 11:48:44 2017 -0800" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I015ec135dd7a62e001bee4c1356a9bc87814aa6d\nAuto-generated-cl: translation import\n" }, { "commit": "e1a7e67dc0d7ae4d4bf93b86b95e674495704bd3", "tree": "fa9cd3c62c4613f61d4aadb09bc7f07db5c87a03", "parents": [ "f2a54b6a39e62eb6d0538180b831705d2e629a29", "319b44e6e95a977f37534672d8906ae392dd23d3" ], "author": { "name": "Christine Franks", "email": "christyfranks@google.com", "time": "Sat Jan 21 05:36:08 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jan 21 05:36:12 2017 +0000" }, "message": "Merge \"DO NOT MERGE - Require password to FR in carrier demo mode\" into nyc-mr2-dev" }, { "commit": "f2a54b6a39e62eb6d0538180b831705d2e629a29", "tree": "7d9bd35a71d46ebf390eb2f354bbc6713493c2bf", "parents": [ "c281fd12af719d71322aed3c4410bf0a4cccdbd2", "fd104e7fde7f53700da58cbab57d73b938b837a7" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jan 21 05:04:21 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jan 21 05:04:24 2017 +0000" }, "message": "Merge \"Load EGL early in Activity launch, instead of in Zygote\" into nyc-mr2-dev" }, { "commit": "319b44e6e95a977f37534672d8906ae392dd23d3", "tree": "298a402bdace820c99ce6ffc0c8f700521cc5919", "parents": [ "c281fd12af719d71322aed3c4410bf0a4cccdbd2" ], "author": { "name": "Christine Franks", "email": "christyfranks@google.com", "time": "Fri Jan 20 11:56:32 2017 -0800" }, "committer": { "name": "Christine Franks", "email": "christyfranks@google.com", "time": "Sat Jan 21 02:25:39 2017 +0000" }, "message": "DO NOT MERGE - Require password to FR in carrier demo mode\n\nBug: 34341567\nTest: manual - password not required for regular user factory resets\nand is required in carrier demo mode.\n\nChange-Id: If696e5c5c806e31399e33a151b0d36e7a950ceb0\n" }, { "commit": "fd104e7fde7f53700da58cbab57d73b938b837a7", "tree": "b8011607d809cf0d1372538ee46b04dd7e58945a", "parents": [ "20cf769d96f1a2dae9e99d50f0d3dedc1e92b83f" ], "author": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Thu Jan 19 17:59:08 2017 -0800" }, "committer": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Fri Jan 20 15:58:20 2017 -0800" }, "message": "Load EGL early in Activity launch, instead of in Zygote\n\nPreloading EGL in Zygote was originally a memory footprint\noptimization, but it turns out to be an important app startup time\noptimization as well. Preloading EGL in Zygote is incompatible with\nupdatable graphics drivers, but we don\u0027t want to do it on-demand as\npart of drawing the first frame either, since that increases\nfirst-frame latency unacceptably.\n\nThis change removes Zygote preload, and instead loads EGL on a\nlow-priority background thread immediately after choosing which\ngraphics driver to use. This means it is usually done well before\ndrawing the first frame, without significantly disrupting other\nactivity launch work.\n\nTest: observe systrace of Calculator launch on bullhead\nBug: 34404021\nChange-Id: I6a0f6b90ade21848a10d51ddae62c936f70151b5\nMerged-In: I887aa09bd35b088b16f53a89838a0c7c98f15761\n" }, { "commit": "e256a18dcd8c0fda68abc5005c405eb8a5c18bea", "tree": "282a8ddc226bdb5700da2d1459a49cab9cc37147", "parents": [ "5e7fc7ccc8b995dce816d2166c747a63ffe91923" ], "author": { "name": "Nancy Zheng", "email": "nzheng@google.com", "time": "Mon Nov 21 15:46:08 2016 -0800" }, "committer": { "name": "Nancy Zheng", "email": "nzheng@google.com", "time": "Fri Jan 20 13:46:31 2017 -0800" }, "message": "Query for the settings package in KeyguardManager instead of\nhardcoding it.\n\nBug: 33047002\nChange-Id: I57bfab4750540789937d50c72ec05bb7a4535ae1\n" }, { "commit": "c281fd12af719d71322aed3c4410bf0a4cccdbd2", "tree": "efadba81a9f236a559f6a4e3b68ab2dd2938421e", "parents": [ "c1a1348b998afd706093e86433f3438c86630772", "232b0d4088913825d257145993c2df826e452ebf" ], "author": { "name": "Philipp Weiß", "email": "phweiss@google.com", "time": "Fri Jan 20 19:12:44 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 20 19:12:48 2017 +0000" }, "message": "Merge \"DO NOT MERGE Finalize device-monitoring dialog strings\" into nyc-mr2-dev" }, { "commit": "232b0d4088913825d257145993c2df826e452ebf", "tree": "da6070ee7d83694efcf6707872ea1bcb4377fb59", "parents": [ "fb764b703529023ad46c5cb689bf538101a17af3" ], "author": { "name": "phweiss", "email": "phweiss@google.com", "time": "Fri Jan 20 18:41:57 2017 +0100" }, "committer": { "name": "Philipp Weiß", "email": "phweiss@google.com", "time": "Fri Jan 20 18:31:52 2017 +0000" }, "message": "DO NOT MERGE Finalize device-monitoring dialog strings\n\nAdd Char-limits, do minor style changes and remove STOPSHIP comment.\n\nRelated change on master:\nag/1800040\n0d08ca7d7fa12217f4a6562764b4ea65f3fa31f2\n\nBUG:33655277\nBUG:31207965\nBUG:29748723\nTest: only string changes\nChange-Id: I37d1b509c6344d7f7d144fc0d8950f45faeaaef4\n" }, { "commit": "c1a1348b998afd706093e86433f3438c86630772", "tree": "c94b71d02d2910347ac67d01fdfe7d940e9f6661", "parents": [ "1dcfc423cde75bf558635a1f1935f455aeaa2bfa", "f48d5ce63095524724f084183d97453f943ff453" ], "author": { "name": "Ta-wei Yen", "email": "twyen@google.com", "time": "Fri Jan 20 18:31:41 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 20 18:31:45 2017 +0000" }, "message": "Merge \"Add voicemail backup/restore columns\" into nyc-mr2-dev" }, { "commit": "1dcfc423cde75bf558635a1f1935f455aeaa2bfa", "tree": "00ce6a424d4b07af27739ea0673777641936628f", "parents": [ "fb764b703529023ad46c5cb689bf538101a17af3", "83a218c416ffc0096b99bc33eb007bbf218d9ced" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Jan 20 18:17:58 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 20 18:18:01 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Do not report boot timings on first boot or runtime restart\" into nyc-mr2-dev" }, { "commit": "83a218c416ffc0096b99bc33eb007bbf218d9ced", "tree": "5be1ab5e10df9ce821fecab1cda68d70740dfe8b", "parents": [ "18f1a35d466a6afd08014daeb0e3021fb8172071" ], "author": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Thu Jan 19 12:11:32 2017 -0800" }, "committer": { "name": "Fyodor Kupolov", "email": "fkupolov@google.com", "time": "Fri Jan 20 17:32:50 2017 +0000" }, "message": "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart\n\nDuring first boot after OTA, additional dexopting has to be done\nduring PM initialization. Timings for OTA are reported separately,\nso we should ignore first boot to avoid skewing the metrics.\n\nThe following metrics were updated:\n - framework_locked_boot_completed\n - framework_boot_completed\n \nCherry-picked from commit 1d87e40d4214a7f6d20a58d6f27cca174f0d974e\n\nTest: manual\nBug: 32807863\nChange-Id: I9d545cf38118f45f3f13597df2949d0ae4abd26a\n" }, { "commit": "fb764b703529023ad46c5cb689bf538101a17af3", "tree": "963e4052a0f5ea2346d5e229232aae0b3170833c", "parents": [ "a2bbc26979b0eabf6cd4ed64c9640ef6176eab91", "90f4f5290b971aefcf7cab306b3e95168ed53585" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jan 20 04:05:27 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 20 04:05:31 2017 +0000" }, "message": "Merge \"2D Recents: round task thumbnails properly.\" into nyc-mr2-dev" }, { "commit": "f48d5ce63095524724f084183d97453f943ff453", "tree": "66b17f7bf8a6c60b5996af9768a376ad2a8a4fd8", "parents": [ "f36beac9566ea4b2454b3140fcde5d83b802b553" ], "author": { "name": "Ta-wei Yen", "email": "twyen@google.com", "time": "Thu Jan 19 16:20:43 2017 -0800" }, "committer": { "name": "Ta-wei Yen", "email": "twyen@google.com", "time": "Fri Jan 20 02:26:04 2017 +0000" }, "message": "Add voicemail backup/restore columns\n\nBACKED_UP and RESTORED are required for dialer voicemail backup/restore\nfeature for N MR2. As there are no API bump the fields will be hidden\nin NMR2. These fields will be made public in O.\n\nARCHIVED and IS_OMTP_VOICEMAIL is not used for NMR2, but added in\nadvance to avoid multiple database upgrades.\n\nIS_OMTP_VOICEMAIL will be used in O to dedupe multiple apps implementing\nVisualVoicemailService. All voicemail inserted by the service should\nset this field to 1. The UI should only display voicemails with this\nfield set to 1 when the source_package is also the current active\nVisualVoicemailService, as other sources represents the same source of\ntruth(the carrier) but is outdated.\n\nFor example, the query should be\nWHERE (is_omtp_voicemail \u003d\u003d 0) OR \n(is_omtp_voicemail \u003d\u003d 1 AND source_package \u003d \"current.vvm.package\")\n\nTest: VoicemailProviderTest\nBug: 34463609\nChange-Id: I0f3e58fabff2102adf5bc29d81dac46c7e71d410\n" }, { "commit": "a2bbc26979b0eabf6cd4ed64c9640ef6176eab91", "tree": "f6645ee16af0c8e2ae6d254d5c06496e57e68d8f", "parents": [ "44db90262efa79b6dacb2c06a84aee27b94acfac", "e710a6fc6663048e0c3302c085a409aa1045a21a" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Fri Jan 20 01:41:11 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 20 01:41:11 2017 +0000" }, "message": "Use separate switch ops for runtime permissions\nam: e710a6fc66\n\nChange-Id: I86cd237bffdde972de69b91fa086ac5f5ec349e8\n" }, { "commit": "90f4f5290b971aefcf7cab306b3e95168ed53585", "tree": "197caa8681c2a35d23f8d1fba7334ca297f99f7a", "parents": [ "44db90262efa79b6dacb2c06a84aee27b94acfac" ], "author": { "name": "Jiaquan He", "email": "hejq@google.com", "time": "Mon Jan 09 15:50:35 2017 -0800" }, "committer": { "name": "Jiaquan He", "email": "hejq@google.com", "time": "Thu Jan 19 16:01:26 2017 -0800" }, "message": "2D Recents: round task thumbnails properly.\n\nTest: Checked that on local sw600dp devices, task views are rounded with\n8dp. Also checked that Recents works properly on phones.\nBug: 32101881\n\nChange-Id: I6f7a09a12c3e3f1f7270bed1ae25b291fadfb8f2\n" }, { "commit": "44db90262efa79b6dacb2c06a84aee27b94acfac", "tree": "fd845ac3f3786712c71dc0df4510eda79ca306cb", "parents": [ "683ea24d6e5074dff5613d407cdfab2fbf5fd7b2" ], "author": { "name": "Jiaquan He", "email": "hejq@google.com", "time": "Thu Jan 19 15:23:56 2017 -0800" }, "committer": { "name": "Jiaquan He", "email": "hejq@google.com", "time": "Thu Jan 19 15:29:54 2017 -0800" }, "message": "2D Recents: handle keyboard config changes.\n\nWhile attaching or detaching a physical keyboard, we should handle the\nconfiguration change in RecentsActivity, so that the activity isn\u0027t\nrelaunched and causes abnormal behaviors.\n\nTest: Checked that while keyboard is attached or detached, Recents\nbehaves normally.\nBug: 32101881\n\nChange-Id: Ibd185aeb48b31dbde032e235fdcaa17fbcdd9c8a\n" }, { "commit": "683ea24d6e5074dff5613d407cdfab2fbf5fd7b2", "tree": "fce0f2fa5e3f3042b7f6702a7f39b160c75fb72e", "parents": [ "18f1a35d466a6afd08014daeb0e3021fb8172071", "c0e181394431fb13420f7bd0415231075cb1b469" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jan 19 19:36:40 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 19 19:36:44 2017 +0000" }, "message": "Merge \"Add arrow key navigation support to Grid-based Recents.\" into nyc-mr2-dev" }, { "commit": "e710a6fc6663048e0c3302c085a409aa1045a21a", "tree": "be0b3505e0fd6a1d62dcca5a6ad03abb5053fe5a", "parents": [ "05b2d3eb0defbcc7f4e2aa270cfa179e256e0aeb" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Wed Sep 21 19:50:14 2016 -0700" }, "committer": { "name": "Shijian Li", "email": "shijianli@google.com", "time": "Thu Jan 19 12:31:42 2017 +0000" }, "message": "Use separate switch ops for runtime permissions\n\nIf permissions review is enabled we allow individual\ncontrol of fine graned permissions in the SMS group.\nThis change ensures these permissions use the\ncorresponding app op as a switch to allow indifidual\ncontrol.\n\nChange-Id: I83cd78a78a8266df8324b8a10cd9e36c04ff3112\n(cherry picked from commit 99e4d51584202433f1628faa3441e5ced5cf7a0f)\n" }, { "commit": "18f1a35d466a6afd08014daeb0e3021fb8172071", "tree": "a4067731e563677ef19f56889d79eedbc5c0c0a6", "parents": [ "bb08c408a896d5c23263f7f9e103cd0bfcdc623a", "a19f9f281a430c68474c4c115ef114f29b727231" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jan 19 07:57:11 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 19 07:57:15 2017 +0000" }, "message": "Merge \"Eschew unspecified IP addresses for DNS servers\" into nyc-mr2-dev" }, { "commit": "bb08c408a896d5c23263f7f9e103cd0bfcdc623a", "tree": "56627c1db7f17dcd358a00412e4325f21513f90c", "parents": [ "7c0a5220cbdfd43fcb0cdea9b3869fc64c715304", "2b465d889c433b018f62f42910f78d8957e9bdbd" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Jan 19 06:27:20 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 19 06:27:24 2017 +0000" }, "message": "Merge \"VPN reconnection fails after manually disabling VPN\" into nyc-mr2-dev" }, { "commit": "a19f9f281a430c68474c4c115ef114f29b727231", "tree": "f1cd248314a5da00b9e472c40b368c6ba9dd8c8c", "parents": [ "7c0a5220cbdfd43fcb0cdea9b3869fc64c715304" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jan 19 14:24:26 2017 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Thu Jan 19 15:27:08 2017 +0900" }, "message": "Eschew unspecified IP addresses for DNS servers\n\nTest: as follows\n - built\n - flashed\n - booted\n - runtest frameworks-wifi passes (though no test covers this code yet)\nBug: 34210527\nChange-Id: I2d44445982dfb3221f7b6394daf0479c1fa8a6e1\n" }, { "commit": "7c0a5220cbdfd43fcb0cdea9b3869fc64c715304", "tree": "121b999f4cce8093a66337666d05fa8274b66179", "parents": [ "9ba372781e8cb68f3ccb41642fb937e4be4cdcf9", "c2eddc99cdeee941f0b7cd2379960046b7b3698d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jan 19 04:43:46 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 19 04:43:49 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev" }, { "commit": "9ba372781e8cb68f3ccb41642fb937e4be4cdcf9", "tree": "29a66bcd5d86cb80b301cee5f2e3c90a79a9c8c0", "parents": [ "b1ccd81fba2deb4f0befa97610b3ec044eae8e26", "61385acb7a550beb071270cfb6efe1724194a0b3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jan 19 04:43:03 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 19 04:43:06 2017 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE\" into nyc-mr2-dev" }, { "commit": "2b465d889c433b018f62f42910f78d8957e9bdbd", "tree": "716739074af00cfc733c4d0ac5edb9dca768acd6", "parents": [ "b1ccd81fba2deb4f0befa97610b3ec044eae8e26" ], "author": { "name": "Hisanobu Watanabe", "email": "hisanobu.xa.watanabe@sonymobile.com", "time": "Tue Jun 07 19:55:41 2016 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Thu Jan 19 12:38:22 2017 +0900" }, "message": "VPN reconnection fails after manually disabling VPN\n\nWhen disabling VPN manually, there was no trigger for ipsec-tools to\nsend “delete message” to VPN server. Therefore, connection information\nis left in VPN server and next connection fails.\n\nFix this issue as below:\n- Add “delete message” sending via flush in ipsec-tools when racoon\n daemon stops\n- Keep daemon alive when VPN.java exit() to let it finish sending to\n VPN server\n- Move close(socket) and stop(daemon) in VPN.java execute()\n and monitorDaemons() to run() to gather cleaning block.\n\n(cherry picked from commit 047454c759b46bbadb87ee3b64bf3e29afda48d6)\n\nChange-Id: Ibfbd389b17de5b5a5d23cba59c8d1e05fbe12c15\nBug: 28279646\nBug: 33467086\n" }, { "commit": "b1ccd81fba2deb4f0befa97610b3ec044eae8e26", "tree": "10b1cdb4875ab80292963d520bf33ffd35b8a187", "parents": [ "92f7fab9f623c5cba3e2df8def68f6372ad17e5c", "05b2d3eb0defbcc7f4e2aa270cfa179e256e0aeb" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Thu Jan 19 02:16:46 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jan 19 02:16:46 2017 +0000" }, "message": "Merge \"Validate custom pointer icons aren\u0027t null.\" into cw-f-dev\nam: 05b2d3eb0d\n\nChange-Id: I3a11e06dfe3f476b791838241bfb36e5362063ab\n" }, { "commit": "92f7fab9f623c5cba3e2df8def68f6372ad17e5c", "tree": "10b1cdb4875ab80292963d520bf33ffd35b8a187", "parents": [ "12ea12aab54b2d02b4357836d7d8773c1a4d6c28", "35068079c833b5ea508c378701b159b99ee39279" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Thu Jan 19 02:16:42 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jan 19 02:16:42 2017 +0000" }, "message": "Validate custom pointer icons aren\u0027t null.\nam: 35068079c8\n\nChange-Id: I37fdde3c1ea735c4888760f3aab43caf7711dd0e\n" }, { "commit": "05b2d3eb0defbcc7f4e2aa270cfa179e256e0aeb", "tree": "7157209299a89731c862decb69ed0e70f63f559a", "parents": [ "b8c8b67789eb928261f64c423f02faab65d108d0", "35068079c833b5ea508c378701b159b99ee39279" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jan 19 02:12:10 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 19 02:12:20 2017 +0000" }, "message": "Merge \"Validate custom pointer icons aren\u0027t null.\" into cw-f-dev" }, { "commit": "12ea12aab54b2d02b4357836d7d8773c1a4d6c28", "tree": "35251e7afa4f8de8723c580ee93b9f8caac2469c", "parents": [ "1cf89cb8ee036619976324c87e2bf0dffad286f2", "fc6ac0a78af37a072a006180203591d49857dc69" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Jan 19 01:26:00 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 19 01:26:03 2017 +0000" }, "message": "Merge \"2D Recents: polish the app -\u003e recents transition\" into nyc-mr2-dev" }, { "commit": "61385acb7a550beb071270cfb6efe1724194a0b3", "tree": "58bf0b453859837371335c9f1a7d67dd8c35bb17", "parents": [ "eed0a7bf45bf530ced0669d360482a9f3ca5fc32" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Jan 18 17:06:36 2017 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Jan 18 17:06:36 2017 -0800" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I5becba7c3473850f08ce948491d37b2cc2f5e35f\nAuto-generated-cl: translation import\n" }, { "commit": "c2eddc99cdeee941f0b7cd2379960046b7b3698d", "tree": "0d252a47c2d88873de34d0671f6b8dd404b5d169", "parents": [ "eed0a7bf45bf530ced0669d360482a9f3ca5fc32" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Jan 18 16:57:28 2017 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Wed Jan 18 16:57:28 2017 -0800" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: I0c14cd3eb5a5d0a4d1640458bcad2aa160cdddca\nAuto-generated-cl: translation import\n" }, { "commit": "1cf89cb8ee036619976324c87e2bf0dffad286f2", "tree": "c3db86d18902961778d40abb940e892a61c90251", "parents": [ "81e8bdd420d00c8b60616743b47d2170d1ff2ea8", "ed371cb035dcdf06bab9bd81fbe96d184a54611f" ], "author": { "name": "Daniel Nishi", "email": "dhnishi@google.com", "time": "Thu Jan 19 00:33:13 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 19 00:33:16 2017 +0000" }, "message": "Merge \"Remove the requirement of the --checkin flag.\" into nyc-mr2-dev" }, { "commit": "fc6ac0a78af37a072a006180203591d49857dc69", "tree": "e68b8b87111558be28c94acf647bb21b1191c898", "parents": [ "748e78bd2cb2f0813da48f918c4192d23bc35d7d" ], "author": { "name": "Manu Cornet", "email": "manucornet@google.com", "time": "Wed Jan 18 15:42:14 2017 -0800" }, "committer": { "name": "Manu Cornet", "email": "manucornet@google.com", "time": "Wed Jan 18 15:55:51 2017 -0800" }, "message": "2D Recents: polish the app -\u003e recents transition\n\n* Do not draw the header as part of the transition thumbnail\n since the header is already shown. Just let the thumbnail\n slot into the task view already drawn on screen.\n* Shift the target rectangle by the header height so that\n the end state of the animation corresponds exactly to the\n task view layout.\n* Remove unused local variable.\n\nBug: 32101881\nBug: 33752154\nTest: Checked/screencasted recents -\u003e app -\u003e recents animations on local sw600dp device\nChange-Id: I4c8ce52b378567114735e6bd582572124a2a354c\n" }, { "commit": "81e8bdd420d00c8b60616743b47d2170d1ff2ea8", "tree": "558cf7c1cdd84c9489404f101bc1b4637fb40b62", "parents": [ "146f68a4459ed7c8353f2976c3366d15afb0c91b", "47dd7c51e9eb20f3cbd7536f60681ae926e2258e" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jan 18 23:51:32 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 18 23:51:35 2017 +0000" }, "message": "Merge \"2D Recents: use a different background color for drop targets\" into nyc-mr2-dev" }, { "commit": "146f68a4459ed7c8353f2976c3366d15afb0c91b", "tree": "ece012d7fb047025b0a238c8659ff8b1a9068932", "parents": [ "64a16be2ba39aa17cc477d7a1f796609413c6215", "45c8048f4f8996f085c78621efaf710c907ce213" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jan 18 23:34:05 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 18 23:34:07 2017 +0000" }, "message": "Merge \"2D Recents: to and from home, animate task views as a block\" into nyc-mr2-dev" }, { "commit": "64a16be2ba39aa17cc477d7a1f796609413c6215", "tree": "617ec7c7245bf0ccd43dfcc9edb988f937c0a5a3", "parents": [ "32a16bada44df41b7c070cef06835a38e16482bb", "b189aa6cf86c94240732ce58f6404307a0a0fcf4" ], "author": { "name": "Christine Franks", "email": "christyfranks@google.com", "time": "Wed Jan 18 23:24:44 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 18 23:24:46 2017 +0000" }, "message": "Merge \"DO NOT MERGE - Fix demo mode reset notification\" into nyc-mr2-dev" }, { "commit": "32a16bada44df41b7c070cef06835a38e16482bb", "tree": "dbd11527a493fbea5846154fd8962175a64c83db", "parents": [ "4b2542315fb19806361bc8f06cbaa81856f0852d", "ef161dd6ef3229e2935ef22be8bafbf108a489be" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jan 18 23:09:38 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 18 23:09:41 2017 +0000" }, "message": "Merge \"Add isChildDocument to MtpDocumentsProvider.\" into nyc-mr2-dev" }, { "commit": "4b2542315fb19806361bc8f06cbaa81856f0852d", "tree": "458c3764c8a821dbbfbc02b7a848fb69863b7e4a", "parents": [ "2a147464f62d7cbe7e550c0b17ddcc9a82393891", "d909f805a24df1cc0d16755738ba069be232c1e9" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jan 18 22:54:36 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 18 22:54:39 2017 +0000" }, "message": "Merge \"Not create document under the device.\" into nyc-mr2-dev" }, { "commit": "c0e181394431fb13420f7bd0415231075cb1b469", "tree": "2d77a3f63c1fb5a8c3d87834b2afd0532a1e6068", "parents": [ "2a147464f62d7cbe7e550c0b17ddcc9a82393891" ], "author": { "name": "Jiaquan He", "email": "hejq@google.com", "time": "Wed Jan 11 14:47:00 2017 -0800" }, "committer": { "name": "Jiaquan He", "email": "hejq@google.com", "time": "Wed Jan 18 14:17:54 2017 -0800" }, "message": "Add arrow key navigation support to Grid-based Recents.\n\nTest: Checked that arrow key navigation works in Recents on local\nsw600dp devices. Also checked that Recents works properly on phones.\nBug: 32101881\n\nChange-Id: I8ece3fc4c9ae82916efcbbde72d40805e43cc70d\n" }, { "commit": "2a147464f62d7cbe7e550c0b17ddcc9a82393891", "tree": "cbaddfdbd4b4ceb3cf2193b8bc271c6168616cbf", "parents": [ "a88749fb5169018ecb1e7551e8598771d1ca3f13", "21f495f07b1b9ace99986a110d01a763847687b1" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jan 18 22:14:20 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 18 22:14:22 2017 +0000" }, "message": "Merge \"Add keyboard support to Grid-based Recents.\" into nyc-mr2-dev" }, { "commit": "a88749fb5169018ecb1e7551e8598771d1ca3f13", "tree": "3aba9e187d92515c2a0758faf22917502ed712ff", "parents": [ "b6973a8c8294ea211b8e4237169d8029c779a917", "244bac6c8bb8c7ef621786b42cf26dafaa417829" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jan 18 22:06:20 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 18 22:06:22 2017 +0000" }, "message": "Merge \"2D Recents: Fix issue with undocking only one task\" into nyc-mr2-dev" }, { "commit": "b6973a8c8294ea211b8e4237169d8029c779a917", "tree": "13c6bd19941b06f7d152715118874cdd49f45848", "parents": [ "cf7b579868d2d4f4a171a79f9e3ef1264ed92d25", "b8c8b67789eb928261f64c423f02faab65d108d0" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Wed Jan 18 21:04:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 18 21:04:21 2017 +0000" }, "message": "Merge \"DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.\" into cw-f-dev\nam: b8c8b67789 -s ours\n\nChange-Id: I502a61cc0c1c6caaf18a7d0c03aa558541b3c17f\n" }, { "commit": "cf7b579868d2d4f4a171a79f9e3ef1264ed92d25", "tree": "13c6bd19941b06f7d152715118874cdd49f45848", "parents": [ "748e78bd2cb2f0813da48f918c4192d23bc35d7d", "4a601f972a9930e26aa2ead8995cc8b97c1844b3" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Wed Jan 18 21:04:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 18 21:04:19 2017 +0000" }, "message": "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.\nam: 4a601f972a -s ours\n\nChange-Id: Id66c49cfa6010ab327f46e85a6940bd52102eeea\n" }, { "commit": "b8c8b67789eb928261f64c423f02faab65d108d0", "tree": "a3f34068d31036c2e36b942aa70581a9fce40dfd", "parents": [ "189463286449b618633ea928de39113499a08c03", "4a601f972a9930e26aa2ead8995cc8b97c1844b3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Jan 18 20:57:07 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 18 20:57:11 2017 +0000" }, "message": "Merge \"DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.\" into cw-f-dev" }, { "commit": "47dd7c51e9eb20f3cbd7536f60681ae926e2258e", "tree": "cfcd77070e89b0dbfab69387d71a54c1e0cd9ded", "parents": [ "748e78bd2cb2f0813da48f918c4192d23bc35d7d" ], "author": { "name": "Manu Cornet", "email": "manucornet@google.com", "time": "Tue Jan 10 13:26:25 2017 -0800" }, "committer": { "name": "Manu Cornet", "email": "manucornet@google.com", "time": "Wed Jan 18 12:54:03 2017 -0800" }, "message": "2D Recents: use a different background color for drop targets\n\nBug: 32101881\nTest: Checked layout and animations in Recents, on local sw600dp device.\nChange-Id: I628bd0866691e5badd7a37c88020e1e10e1902f7\n" }, { "commit": "35068079c833b5ea508c378701b159b99ee39279", "tree": "0f297d76b0061d4eee1526c108ad22d8af5bdb9a", "parents": [ "189463286449b618633ea928de39113499a08c03" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Wed Jan 18 18:09:29 2017 +0000" }, "committer": { "name": "Erik Wolsheimer", "email": "ewol@google.com", "time": "Wed Jan 18 20:48:44 2017 +0000" }, "message": "Validate custom pointer icons aren\u0027t null.\n\nBug: 33853287\nTest: cts\nChange-Id: I844a9aec6e37e306a77eee0644a774f6470cf5df\n(cherry picked from commit b004b5137e12bffae9a3d3ae97440c8c24bdc07a)\n" }, { "commit": "45c8048f4f8996f085c78621efaf710c907ce213", "tree": "dc8f8fce5b7297683ba5af534808d22ac3d0bc0f", "parents": [ "748e78bd2cb2f0813da48f918c4192d23bc35d7d" ], "author": { "name": "Manu Cornet", "email": "manucornet@google.com", "time": "Tue Dec 20 18:42:16 2016 -0800" }, "committer": { "name": "Manu Cornet", "email": "manucornet@google.com", "time": "Wed Jan 18 11:33:59 2017 -0800" }, "message": "2D Recents: to and from home, animate task views as a block\n\nBug: 32101881\nTest: Checked animations to/from home on local sw600dp device\nChange-Id: I74b8b02bb39be6d4e4553f7d74550ff177d47a5e\n" }, { "commit": "4a601f972a9930e26aa2ead8995cc8b97c1844b3", "tree": "be705500a1a63d7416eb61906efdef9051ba552c", "parents": [ "4518d0be1623c8d1925db9d480618f6c46ff1461" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Tue Jan 17 13:50:46 2017 -0800" }, "committer": { "name": "Zheng Zhang", "email": "zhzh@google.com", "time": "Wed Jan 18 11:10:15 2017 -0800" }, "message": "DO NOT MERGE ANYWHERE Skip review permissions if package is installed with -g.\n\nBug: 34193954\n\nChange-Id: Id744fd190ef78e498e635c2ab9936f12d0bbc917\n(cherry picked from commit 6130fb741c86d7d4f0f86e3a875c3eca1fe8aa51)\n" }, { "commit": "748e78bd2cb2f0813da48f918c4192d23bc35d7d", "tree": "13c6bd19941b06f7d152715118874cdd49f45848", "parents": [ "eed0a7bf45bf530ced0669d360482a9f3ca5fc32", "189463286449b618633ea928de39113499a08c03" ], "author": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Wed Jan 18 17:47:02 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 18 17:47:02 2017 +0000" }, "message": "Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af am: ee9f03d1ed\nam: 1894632864\n\nChange-Id: I4328578f929875fd59f48681b8ae2c7c4d3bd623\n" }, { "commit": "b189aa6cf86c94240732ce58f6404307a0a0fcf4", "tree": "db1a1feafb461b78da1215d67ecf9300677aae3d", "parents": [ "70c0f5c2c7105470cb52cb3d96da54731edd1b0c" ], "author": { "name": "Christine Franks", "email": "christyfranks@google.com", "time": "Wed Jan 18 09:37:15 2017 -0800" }, "committer": { "name": "Christine Franks", "email": "christyfranks@google.com", "time": "Wed Jan 18 09:43:40 2017 -0800" }, "message": "DO NOT MERGE - Fix demo mode reset notification\n\nBug: 34358856\nTest: manually verified that tapping the Reset notification\ntriggers a reset after initial provisioning.\n\nChange-Id: I7cf4db729384630a85b22ca9b4947198974a8fbf\n" }, { "commit": "189463286449b618633ea928de39113499a08c03", "tree": "40155013e4855c7554ff7bcf86bd9675a8fe9f63", "parents": [ "1876583bfbf5ec5f17fedb650eb82c3f52ff4a8f", "ee9f03d1ed263d975fea213453204729ec80730f" ], "author": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Wed Jan 18 17:33:33 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 18 17:33:33 2017 +0000" }, "message": "Fix issue with saving admins before finishing loading. am: f98ed6863a am: b275a205af\nam: ee9f03d1ed\n\nChange-Id: Ic724588cbab8d4282eeb5bc806f8c67791189a05\n" }, { "commit": "ee9f03d1ed263d975fea213453204729ec80730f", "tree": "42f2f4f30d55f8250376f487953f5e6137095ab9", "parents": [ "332762aaf0c21aafa16a24721c0849d44b154542", "b275a205af6014c67a34507240ce0fc1026815b5" ], "author": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Wed Jan 18 17:27:10 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 18 17:27:10 2017 +0000" }, "message": "Fix issue with saving admins before finishing loading. am: f98ed6863a\nam: b275a205af\n\nChange-Id: I01487d9c39f4e82b63961cdd43df238f2bfd2b89\n" }, { "commit": "b275a205af6014c67a34507240ce0fc1026815b5", "tree": "d6265ca8a1a04672145118375325927e3fcb3876", "parents": [ "ea9463f542e61a587ede505dd3c2393d101abfc3", "f98ed6863a7f64c535a66006852a934b05d550bc" ], "author": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Wed Jan 18 17:13:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 18 17:13:31 2017 +0000" }, "message": "Fix issue with saving admins before finishing loading.\nam: f98ed6863a\n\nChange-Id: I7f816c164548df86f9607c86772902efd0d53620\n" }, { "commit": "eed0a7bf45bf530ced0669d360482a9f3ca5fc32", "tree": "13c6bd19941b06f7d152715118874cdd49f45848", "parents": [ "13f18efb8f4e6c7adf911719c34a5d33acb956ae", "1876583bfbf5ec5f17fedb650eb82c3f52ff4a8f" ], "author": { "name": "Tucker Sylvestro", "email": "tuckeris@google.com", "time": "Wed Jan 18 16:34:50 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jan 18 16:34:50 2017 +0000" }, "message": "svc nfc should support watches too\nam: 1876583bfb\n\nChange-Id: Ic3f0277c2c13dbd2c4f8b6ec5dbe9f9dc34ef297\n" }, { "commit": "1876583bfbf5ec5f17fedb650eb82c3f52ff4a8f", "tree": "7f3e0a41bebf13166b36f1bd5bcf5987876afe4e", "parents": [ "df459cb2eac35ee3e819c519e372dcb6e3a035bb" ], "author": { "name": "Tucker Sylvestro", "email": "tuckeris@google.com", "time": "Wed Dec 14 14:01:14 2016 -0500" }, "committer": { "name": "Tucker Sylvestro", "email": "tuckeris@google.com", "time": "Wed Jan 18 10:27:38 2017 -0500" }, "message": "svc nfc should support watches too\n\nCheck for both FEATURE_NFC and FEATURE_NFC_HOST_CARD_EMULATION in the\n\"svc nfc\" command. Watches may only have the latter, but should still\nsupport the nfc enable/disable command.\n\nSee b/24532713#comment7 for context.\n\nBug 32386425\n\nChange-Id: I307798f00728c6b437aebfcf58115af7265e3692\n" }, { "commit": "f98ed6863a7f64c535a66006852a934b05d550bc", "tree": "0288e68440db9b9b5d447cdcf740ed0132cfcab9", "parents": [ "97848fc473f0f03a19c69aa0b2b9c97e7c10cd4e" ], "author": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Tue Jan 17 23:33:41 2017 +0000" }, "committer": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Wed Jan 18 12:01:55 2017 +0000" }, "message": "Fix issue with saving admins before finishing loading.\n\nSaving device policy managers settings to clear out\npassword stats was happening before initializing mAdminList\nso could wipe active admins.\n\nTest: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.\nTest: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services\n\nBug: 34277435\nChange-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e\n(cherry picked from commit adbda7474cc1968b66e9948aee566dc346e71340)\n" }, { "commit": "13f18efb8f4e6c7adf911719c34a5d33acb956ae", "tree": "0a60083b95ec79eff7926cbc730bdbbc4358c720", "parents": [ "5e2634ba5547aeea765a7b4c0c8e22b395468aa0", "88959dccac788d329b813b050f44281b273763ca" ], "author": { "name": "Sunny Goyal", "email": "sunnygoyal@google.com", "time": "Wed Jan 18 01:45:52 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 18 01:45:55 2017 +0000" }, "message": "Merge \"Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates.\" into nyc-mr2-dev" }, { "commit": "5e2634ba5547aeea765a7b4c0c8e22b395468aa0", "tree": "752878eee7d2a7f6586a7aa17ed35fbf920fc039", "parents": [ "70c0f5c2c7105470cb52cb3d96da54731edd1b0c", "adbda7474cc1968b66e9948aee566dc346e71340" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Wed Jan 18 01:26:56 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 18 01:26:59 2017 +0000" }, "message": "Merge \"Fix issue with saving admins before finishing loading.\" into nyc-mr2-dev" }, { "commit": "adbda7474cc1968b66e9948aee566dc346e71340", "tree": "de822430878adbbdc653481b92370c022a8e8154", "parents": [ "ebf7abb19ebff36f6becaffb922165fc918db4ae" ], "author": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Tue Jan 17 23:33:41 2017 +0000" }, "committer": { "name": "Kenny Guy", "email": "kennyguy@google.com", "time": "Tue Jan 17 23:37:57 2017 +0000" }, "message": "Fix issue with saving admins before finishing loading.\n\nSaving device policy managers settings to clear out\npassword stats was happening before initializing mAdminList\nso could wipe active admins.\n\nTest: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.\nTest: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services\n\nBug: 34277435\nChange-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e\n" }, { "commit": "21f495f07b1b9ace99986a110d01a763847687b1", "tree": "b453f1584640955300347d6afb4f93f96849f07d", "parents": [ "70c0f5c2c7105470cb52cb3d96da54731edd1b0c" ], "author": { "name": "Jiaquan He", "email": "hejq@google.com", "time": "Thu Jan 05 13:00:29 2017 -0800" }, "committer": { "name": "Jiaquan He", "email": "hejq@google.com", "time": "Tue Jan 17 15:34:09 2017 -0800" }, "message": "Add keyboard support to Grid-based Recents.\n\nTest: Checked that pressing tab, shift + tab, alt + tab, alt + shift +\ntab work for task navigation in Recents on local sw600dp device. Also\nchecked that Recents on phones work properly.\nBug: 32101881\nChange-Id: I3e4cd212d2900523ece30a85cae7fb73a9594efb\n" }, { "commit": "70c0f5c2c7105470cb52cb3d96da54731edd1b0c", "tree": "7437c07b0b40bbfab233d548bc798e7198df05af", "parents": [ "f5111345d2bf7fe9ec6e1880b04eac4fcd90bdab", "df459cb2eac35ee3e819c519e372dcb6e3a035bb" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Tue Jan 17 23:03:42 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 17 23:03:42 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Prevent crash from early Toast surface destruction.\" into nyc-mr1-dev am: 332762aaf0\nam: df459cb2ea\n\nChange-Id: I1239cde924e6d31222bf108c6d55ff19a78019ad\n" }, { "commit": "f5111345d2bf7fe9ec6e1880b04eac4fcd90bdab", "tree": "7437c07b0b40bbfab233d548bc798e7198df05af", "parents": [ "c8278f35c746a946b72b3a852e43fb6b307e0a4f", "a7ff8fbe74cc2c35fe2d5d3f9917ee13a38341e8" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Tue Jan 17 23:02:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 17 23:02:52 2017 +0000" }, "message": "[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5\nam: a7ff8fbe74\n\nChange-Id: Ic372436ee48a9f725c178a72c057a2192aad9267\n" }, { "commit": "df459cb2eac35ee3e819c519e372dcb6e3a035bb", "tree": "b4303a7d1bbbaca035db9c4d8cfb046166c7e009", "parents": [ "a7ff8fbe74cc2c35fe2d5d3f9917ee13a38341e8", "332762aaf0c21aafa16a24721c0849d44b154542" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Tue Jan 17 22:58:21 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 17 22:58:21 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Prevent crash from early Toast surface destruction.\" into nyc-mr1-dev\nam: 332762aaf0\n\nChange-Id: I20cc197cc2f1d4d9dd0b6b6c6fee07e71dd4a1d3\n" }, { "commit": "a7ff8fbe74cc2c35fe2d5d3f9917ee13a38341e8", "tree": "b4303a7d1bbbaca035db9c4d8cfb046166c7e009", "parents": [ "4518d0be1623c8d1925db9d480618f6c46ff1461", "016c9c8cb58c6940ae8296291ee33148a17ede65" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Tue Jan 17 22:58:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 17 22:58:18 2017 +0000" }, "message": "[DO NOT MERGE] Prevent crash from early Toast surface destruction.\nam: 016c9c8cb5\n\nChange-Id: Ib33d75a050a1b79de9590f2dbe03609c6e2b4463\n" }, { "commit": "c8278f35c746a946b72b3a852e43fb6b307e0a4f", "tree": "7437c07b0b40bbfab233d548bc798e7198df05af", "parents": [ "20cf769d96f1a2dae9e99d50f0d3dedc1e92b83f", "1d35979f0ada629f192eb1078a29f6eae2c71745" ], "author": { "name": "Selim Cinek", "email": "cinek@google.com", "time": "Tue Jan 17 22:57:08 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 17 22:57:13 2017 +0000" }, "message": "Merge \"Not allowing foreground services to be cleared as children\" into nyc-mr2-dev" }, { "commit": "332762aaf0c21aafa16a24721c0849d44b154542", "tree": "43e64c05351d37ae56d519db46099433b1245194", "parents": [ "66d66dd50c56cd878116bd92a39079eac5694ef5", "016c9c8cb58c6940ae8296291ee33148a17ede65" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 17 22:53:38 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 17 22:53:42 2017 +0000" }, "message": "Merge \"[DO NOT MERGE] Prevent crash from early Toast surface destruction.\" into nyc-mr1-dev" }, { "commit": "244bac6c8bb8c7ef621786b42cf26dafaa417829", "tree": "b5d384c36d619290884c25ae71f6f83841659ef5", "parents": [ "79bf392dc6d50436ff16693267c808fc115ab07c" ], "author": { "name": "Jiaquan He", "email": "hejq@google.com", "time": "Tue Jan 17 13:25:33 2017 -0800" }, "committer": { "name": "Jiaquan He", "email": "hejq@google.com", "time": "Tue Jan 17 14:52:23 2017 -0800" }, "message": "2D Recents: Fix issue with undocking only one task\n\nWhile there\u0027s only one task and we undock it, it\u0027s not in the Recents\ntask list. In this change, we just reset the transform and return it.\n\nTest: Checked that Recents works properly while docking and undocking a\ntask and it\u0027s the only task running.\nBug: 32101881\n\nChange-Id: I1207b546ff2864018c8d9bf2520f4690762b2d27\n" }, { "commit": "20cf769d96f1a2dae9e99d50f0d3dedc1e92b83f", "tree": "956d4eb5c657e82a0cfb87e1240363530a550a57", "parents": [ "31b755adea8f4aa297ff8da761d46d3b77402179", "4518d0be1623c8d1925db9d480618f6c46ff1461" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Tue Jan 17 22:27:40 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jan 17 22:27:40 2017 +0000" }, "message": "DO NOT MERGE: Propagate revoked permissions in permission review mode\nam: 4518d0be16\n\nChange-Id: Id0525c380c7b9aaf8c160b1e4fad24b9b2756a0d\n" }, { "commit": "4518d0be1623c8d1925db9d480618f6c46ff1461", "tree": "28206e0ab626ec588fdebadaa12f1813f6d11406", "parents": [ "7a6c54128a87eeba73d362a9de2f1f64939bf3a9" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Mon Jan 16 19:22:37 2017 -0800" }, "committer": { "name": "Griff Hazen", "email": "griff@google.com", "time": "Tue Jan 17 22:14:39 2017 +0000" }, "message": "DO NOT MERGE: Propagate revoked permissions in permission review mode\n\nIn permission review mode we represent install permissions for legacy\napps as constantly granted runtime ones since we need to keep per\nuser flags associated with a permission. We were not propagating\na revoked permission for a legacy app when the later is upgraded to\na modern app when permission review is enabled.\n\nTest: CTS test passes and manual testing worked fine\n\nBug: 34240393\nChange-Id: I32b8ffee89cc034661f8eb5a172dbe2349ea4a18\n(cherry picked from commit fe0253b34ec4fdb6afceb11193f29029b524866a)\n" }, { "commit": "31b755adea8f4aa297ff8da761d46d3b77402179", "tree": "da817fe994feac34ecbf5af52b99c980fdd1424e", "parents": [ "a4b7d794b38d81693880274300022e38e89817bd", "e8ce1276e265340fdd6dd3e964dff00916267f4d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 17 22:01:20 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 17 22:01:24 2017 +0000" }, "message": "Merge \"DO NOT MERGE Revert \"Stop preloading EGL/GLES in Zygote\"\" into nyc-mr2-dev" }, { "commit": "a4b7d794b38d81693880274300022e38e89817bd", "tree": "9dc299eaf337fe9990d1414dc35a15b40a01ddec", "parents": [ "ebf7abb19ebff36f6becaffb922165fc918db4ae", "c0432c63de3def1f00f93aedee8050c30c2dc291" ], "author": { "name": "Manu Cornet", "email": "manucornet@google.com", "time": "Tue Jan 17 21:58:05 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 17 21:58:08 2017 +0000" }, "message": "Merge \"2D Recents: Always use grid layout even in split view\" into nyc-mr2-dev" }, { "commit": "c0432c63de3def1f00f93aedee8050c30c2dc291", "tree": "3a79bcf51a8b3cda59250b8c319cdee971d21c91", "parents": [ "79bf392dc6d50436ff16693267c808fc115ab07c" ], "author": { "name": "Manu Cornet", "email": "manucornet@google.com", "time": "Fri Jan 13 09:21:26 2017 -0800" }, "committer": { "name": "Manu Cornet", "email": "manucornet@google.com", "time": "Tue Jan 17 13:56:07 2017 -0800" }, "message": "2D Recents: Always use grid layout even in split view\n\nSimplify the logic a bit, and polish the algorithm to accommodate the\nvarious layout possibilities.\n\nBug: 32101881\nTest: Checked layout in all orientations, with and without split view\nChange-Id: I4a6dd3f7f34664908294ddaf5ea516d8e258edbf\n" }, { "commit": "ed371cb035dcdf06bab9bd81fbe96d184a54611f", "tree": "5044a3cb85940f481a6d587e4663bad7b478ec4b", "parents": [ "ebf7abb19ebff36f6becaffb922165fc918db4ae" ], "author": { "name": "Daniel Nishi", "email": "dhnishi@google.com", "time": "Tue Jan 17 13:28:29 2017 -0800" }, "committer": { "name": "Daniel Nishi", "email": "dhnishi@google.com", "time": "Tue Jan 17 21:29:56 2017 +0000" }, "message": "Remove the requirement of the --checkin flag.\n\nBug: 34351332\nTest: Manual\nChange-Id: Iae8c5782f54c84fc19307468da17a067428c1b2d\n" }, { "commit": "e8ce1276e265340fdd6dd3e964dff00916267f4d", "tree": "c5603f93ab846babf44161b06103b94b3e1446aa", "parents": [ "79bf392dc6d50436ff16693267c808fc115ab07c" ], "author": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Tue Jan 17 12:34:14 2017 -0800" }, "committer": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Tue Jan 17 12:34:14 2017 -0800" }, "message": "DO NOT MERGE Revert \"Stop preloading EGL/GLES in Zygote\"\n\nThis reverts commit 93f630e1c3011a36f6560fd6115cf1a0e809c5e0.\nChange has already been reverted in master, hence DO NOT MERGE.\n\nBug: 34348911\n" }, { "commit": "ebf7abb19ebff36f6becaffb922165fc918db4ae", "tree": "046ed1ad52f18404053915608c92af23ebbf7892", "parents": [ "79bf392dc6d50436ff16693267c808fc115ab07c", "2f6b711ffa735ce3b3be8740c89fced796494451" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Jan 17 18:42:42 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 17 18:42:46 2017 +0000" }, "message": "Merge \"Revert \"DO NOT MERGE ANYWHERE unlock_wave: replace with black\"\" into nyc-mr2-dev" }, { "commit": "79bf392dc6d50436ff16693267c808fc115ab07c", "tree": "549256b5721be97a5fba77182554f90f50b48efd", "parents": [ "a959ccbc33c63213e857f91ea8b06ef5d4cc38f3" ], "author": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Mon Dec 12 12:53:02 2016 -0800" }, "committer": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Sat Jan 14 19:19:28 2017 -0800" }, "message": "Create GraphicsEnvironment for communicating with driver loaders\n\nThe GraphicsEnvironment class is given information during application\nstart, and makes it available to EGL/GLES/Vulkan loaders that don\u0027t\nhave easy access to the VM or to the application Context. Currently\nonly the driver path is handled, but the existing support for setting\nlibrary paths (for Vulkan extensions) and cache directory information\nshould move here.\n\nBug: 33531483\nChange-Id: I4e4e7fb21f1bcc67122e9173514af5f18c063991\nMerged-In: I5820d3d1301d5461e10706f551b268c54d4f8926\n" }, { "commit": "a959ccbc33c63213e857f91ea8b06ef5d4cc38f3", "tree": "7fe67f0ed0520b31a4e57342406daf709e0662ed", "parents": [ "692089376bc2e817074b9ab1ad571201e42e46fb", "93f630e1c3011a36f6560fd6115cf1a0e809c5e0" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jan 14 05:54:14 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jan 14 05:54:18 2017 +0000" }, "message": "Merge \"Stop preloading EGL/GLES in Zygote\" into nyc-mr2-dev" }, { "commit": "93f630e1c3011a36f6560fd6115cf1a0e809c5e0", "tree": "240800b9b7ab54176356cdb5ae0eae7fc5b45eb6", "parents": [ "a303af44f956de593b70bcc7412f213a7c8ab2c4" ], "author": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Sun Dec 11 21:22:16 2016 -0800" }, "committer": { "name": "Jesse Hall", "email": "jessehall@google.com", "time": "Fri Jan 13 20:09:57 2017 -0800" }, "message": "Stop preloading EGL/GLES in Zygote\n\nIt\u0027s not clear this actually makes much difference on modern\ndevices/drivers. With updatable graphics drivers, we\u0027d have to be able\nto unload the preloaded driver from processes that don\u0027t use the\nsystem driver, which is additional complexity and risk.\n\nOn bullhead and sailfish, meminfo actually showed slightly more memory\navailable while sitting at launcher just after boot with this change\nthan previously. Looking at detailed stats, the differences appeared\nto mostly within run-to-run variation, but there wasn\u0027t evidence of a\nregression.\n\nBug: 33531483\nTest: boot through lockscreen/launcher\nChange-Id: I1892302c1750cdbeaf5b9979f8da4dc6bd7b3e75\nMerged-In: I1892302c1750cdbeaf5b9979f8da4dc6bd7b3e75\n" }, { "commit": "692089376bc2e817074b9ab1ad571201e42e46fb", "tree": "e11249bdbae6002849b42a3d113f5150aef194d1", "parents": [ "6760890c388944cd653988004c92a8916e49fb6b", "7a6c54128a87eeba73d362a9de2f1f64939bf3a9" ], "author": { "name": "Wei Liu", "email": "luciferleo@google.com", "time": "Sat Jan 14 03:58:19 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jan 14 03:58:19 2017 +0000" }, "message": "Merge \"Add WearCellularMediatorService to the system server.\" into cw-f-dev\nam: 7a6c54128a\n\nChange-Id: Ide990adaf580e1e5b06a24484c13c090746d65fa\n" }, { "commit": "6760890c388944cd653988004c92a8916e49fb6b", "tree": "e11249bdbae6002849b42a3d113f5150aef194d1", "parents": [ "0e099a283e3bd9baf2b47cfa38f7f0884c1f2da0", "d741f3de8199f526125a461dffd49990fc648541" ], "author": { "name": "Wei Liu", "email": "luciferleo@google.com", "time": "Sat Jan 14 03:51:52 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Jan 14 03:51:52 2017 +0000" }, "message": "Add WearCellularMediatorService to the system server.\nam: d741f3de81\n\nChange-Id: Ica3d90c3748d79b28bf9cad1b3b5468f919e7299\n" }, { "commit": "7a6c54128a87eeba73d362a9de2f1f64939bf3a9", "tree": "7239a33be8fe84c71df2d9fe691a3f16c641dbe6", "parents": [ "b2db3761cdea4d80cbe373b0dc36421d1cc8db4c", "d741f3de8199f526125a461dffd49990fc648541" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jan 14 03:46:06 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jan 14 03:46:09 2017 +0000" }, "message": "Merge \"Add WearCellularMediatorService to the system server.\" into cw-f-dev" }, { "commit": "d741f3de8199f526125a461dffd49990fc648541", "tree": "17a97a29d57eae0ff3bebb2f38bf0d86e8545ffe", "parents": [ "331a4bb8d464aebddad5ec04a27526ef1384cbd5" ], "author": { "name": "Wei Liu", "email": "luciferleo@google.com", "time": "Tue Dec 13 15:44:55 2016 -0800" }, "committer": { "name": "Zach Johnson", "email": "zachoverflow@google.com", "time": "Fri Jan 13 17:51:07 2017 -0800" }, "message": "Add WearCellularMediatorService to the system server.\n\nBug: 33589216\nChange-Id: Icfee08b27c03567ed45e136fc407b51c768515c2\n" }, { "commit": "0e099a283e3bd9baf2b47cfa38f7f0884c1f2da0", "tree": "28ee9e20db61d380156039db6b402f75c7924ea4", "parents": [ "bdd0a2b14ab1da5c739c2658aa94f87daa9b3c04", "cf246af30d007050f8b16bbbae6fbdf8d0559cca" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Jan 14 01:02:43 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jan 14 01:02:46 2017 +0000" }, "message": "Merge \"Treat Latin American locales specially\" into nyc-mr2-dev" }, { "commit": "1d35979f0ada629f192eb1078a29f6eae2c71745", "tree": "4a69e94ab7683e14495f5fd79dde538f6a00256e", "parents": [ "32992b40493b21f5d5abb4e89592a320f3975210" ], "author": { "name": "Selim Cinek", "email": "cinek@google.com", "time": "Fri Jan 13 14:43:43 2017 -0800" }, "committer": { "name": "Selim Cinek", "email": "cinek@google.com", "time": "Fri Jan 13 16:49:48 2017 -0800" }, "message": "Not allowing foreground services to be cleared as children\n\nforground service notifications could simply be cleared\nwhen they were sent as notification children and then\nthe summary was cancelled.\n\nThis also cleans up the logic in systemui and only removes\nthe child if allowed.\n\nThe clear all button could also show under certain conditions\nwhere it shouldn\u0027t have been shown.\n\nChange-Id: I85998b5342bd75425cc6d68e96391299c4f3d83d\nTest: manual\nBug: 33766648\n" }, { "commit": "bdd0a2b14ab1da5c739c2658aa94f87daa9b3c04", "tree": "83867c05f704851e4e0d7bf3d2c09b8a707c604e", "parents": [ "659a650141d3dd904a5714458e3f94a10bf289cd", "d91dd06591a761aa9e3eab519a23b40bf2b0dbcc" ], "author": { "name": "Sudheer Shanka", "email": "sudheersai@google.com", "time": "Sat Jan 14 00:10:05 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jan 14 00:10:08 2017 +0000" }, "message": "Merge \"Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell\" into nyc-mr2-dev" }, { "commit": "659a650141d3dd904a5714458e3f94a10bf289cd", "tree": "bfd06ea98133536149ba408dda5b04e19667b249", "parents": [ "4638ef17d52b780c8fd4004f24e2763e8b50bb9e", "b3152ab96690ba317257629e38c7925359de61e8" ], "author": { "name": "Muyuan Li", "email": "muyuanli@google.com", "time": "Fri Jan 13 21:49:51 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 13 21:49:55 2017 +0000" }, "message": "Merge \"update navbar assets for sw900dp device.\" into nyc-mr2-dev" }, { "commit": "4638ef17d52b780c8fd4004f24e2763e8b50bb9e", "tree": "a322f6efb59edd8bb6669d01e7dc9699bd4293bb", "parents": [ "32992b40493b21f5d5abb4e89592a320f3975210", "36d9a6dfba1a3c39aa3224fdef15cb79e2e9b9a0" ], "author": { "name": "Chris Craik", "email": "ccraik@google.com", "time": "Fri Jan 13 21:46:51 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 13 21:46:55 2017 +0000" }, "message": "Merge \"Support shadows and reordering in ViewOverlay\" into nyc-mr2-dev" }, { "commit": "32992b40493b21f5d5abb4e89592a320f3975210", "tree": "de94363fbe6aa8c540fa719aedd149dd78225837", "parents": [ "3c9b36482f0120756ddcc3b6fe5f57d3136c7902", "b2db3761cdea4d80cbe373b0dc36421d1cc8db4c" ], "author": { "name": "Andrew Scull", "email": "ascull@google.com", "time": "Fri Jan 13 21:17:23 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 13 21:17:23 2017 +0000" }, "message": "Merge \"Don\u0027t save password metrics to disk.\" into nyc-dev am: 97848fc473 am: ea9463f542 am: 66d66dd50c\nam: b2db3761cd\n\nChange-Id: I166a09f1b41c32bb69e2859ef262b9d46996ac87\n" }, { "commit": "3c9b36482f0120756ddcc3b6fe5f57d3136c7902", "tree": "de94363fbe6aa8c540fa719aedd149dd78225837", "parents": [ "0dfa7b58b8ed608ff0d8c313aff7c37adef445e9", "3aac3ebee1079ba56afde5d149b0653c891cb5a8" ], "author": { "name": "Andrew Scull", "email": "ascull@google.com", "time": "Fri Jan 13 21:16:31 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 13 21:16:31 2017 +0000" }, "message": "resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969\nam: 3aac3ebee1\n\nChange-Id: Id7be6d9656b292ec1bf526750db8081022267c4a\n" }, { "commit": "0dfa7b58b8ed608ff0d8c313aff7c37adef445e9", "tree": "b52e32668b2794ecb9f54a4cf454c0683c8eefa0", "parents": [ "2288ee6b01d8bae42199d6e658fba175ae33391b", "331a4bb8d464aebddad5ec04a27526ef1384cbd5" ], "author": { "name": "Philip P. Moltmann", "email": "moltmann@google.com", "time": "Fri Jan 13 21:15:18 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 13 21:15:18 2017 +0000" }, "message": "Do not write if apply() did not change the file. am: 1f99f81bdc\nam: 331a4bb8d4\n\nChange-Id: If200192c12477a4410b0b358e6c7b430c23d1499\n" }, { "commit": "2288ee6b01d8bae42199d6e658fba175ae33391b", "tree": "b52e32668b2794ecb9f54a4cf454c0683c8eefa0", "parents": [ "482ba6b8316a995f5cb0b1b40c7b1f02896aa0bb", "889a420a9e1460a31842a3b1820c3ea3dd18cba5" ], "author": { "name": "Philip P. Moltmann", "email": "moltmann@google.com", "time": "Fri Jan 13 21:14:17 2017 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 13 21:14:17 2017 +0000" }, "message": "Only persist last Shared Preferences state am: d15c4f1da5\nam: 889a420a9e -s ours\n\nChange-Id: I1e440bdfc8d12f30eb6db95b365c15b66479d95d\n" }, { "commit": "482ba6b8316a995f5cb0b1b40c7b1f02896aa0bb", "tree": "b52e32668b2794ecb9f54a4cf454c0683c8eefa0", "parents": [ "ae9e15fa44701c558ef256613e507a1645cfe031", "b632c5546968bc20e60e5b86ded4c41612a47c52" ], "author": { "name": "Justin Klaassen", "email": "justinklaassen@google.com", "time": "Fri Jan 13 21:00:06 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 13 21:00:08 2017 +0000" }, "message": "Merge \"Add support for carrier demo mode\" into nyc-mr2-dev" }, { "commit": "ae9e15fa44701c558ef256613e507a1645cfe031", "tree": "ba31e83e036d431c942086bdbf2e2bb1f2010faa", "parents": [ "409d93356cb747684ee2b16e65c1eb82acf90dec", "e45b50293eb9f13596b3a797ecc6815a443d0cdf" ], "author": { "name": "Pankaj Kanwar", "email": "pkanwar@google.com", "time": "Fri Jan 13 20:45:59 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 13 20:46:02 2017 +0000" }, "message": "Merge \"DO NOT MERGE: Fix to maintain the Carrier Network connection.\" into nyc-mr2-dev" }, { "commit": "409d93356cb747684ee2b16e65c1eb82acf90dec", "tree": "0fa95e8f96f5dfc33e46a93e482aac02b3c9b806", "parents": [ "a4d01c857318b496105531acd63001956ed665e4", "6c08f8da0915f2324b91760e523573b9f829266c" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jan 13 20:24:47 2017 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 13 20:24:50 2017 +0000" }, "message": "Merge \"Add logging for high temp warning.\" into nyc-mr2-dev" } ], "next": "a4d01c857318b496105531acd63001956ed665e4" }