)]}' { "log": [ { "commit": "09e9cdceceb722643e2c80c6544d44a43d7f95f0", "tree": "b286fb90a029e7d734b13a0b550bd1ea893a26ef", "parents": [ "d50d41e4df482a61f840ff912aacea0e00848f41" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Wed Nov 06 14:54:50 2013 -0800" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Dec 09 15:14:41 2013 -0800" }, "message": "DO NOT MERGE : Move some system services to their own sub package.\n\n(Cherry pick from master)\n\nAs a next step they can be moved into separate directories to be\nbuilt as separate modules that may or may not be included in a\nparticular configuration.\n\nMoves AppWidgetService, BackupManagerService, ClipboardService, DevicePolicyMS,\nand WallpaperMS.\n\nChange-Id: Idd92871c1828bdde81d85fe99a9c87a22d53169d\n" }, { "commit": "d50d41e4df482a61f840ff912aacea0e00848f41", "tree": "d632599b0c1f8c6f61bdad31b1532fbe7ff8d326", "parents": [ "e63f6f7c8d0094bdea3fe031a178490b273162cd" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Thu Nov 14 19:24:44 2013 -0800" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Dec 09 15:14:39 2013 -0800" }, "message": "DO NOT MERGE: Don\u0027t freak out if SystemUiService isn\u0027t available\n\nReducing dependencies on system services\n\nChange-Id: Ifb1a3bfb9c8dda5e22ec698ddb588058d20bd566\n" }, { "commit": "e63f6f7c8d0094bdea3fe031a178490b273162cd", "tree": "94baa81ff9af7e0865bb514d80174e2912f7b60f", "parents": [ "de8905e4954c86e8e55775b156ea7929f8fd1030" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Nov 15 11:01:47 2013 -0800" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Dec 09 15:14:37 2013 -0800" }, "message": "DO NOT MERGE: Remove obsolete \"headless\" support\n\nChange-Id: I829fe48e6ebcb819e260646bb19ac6ddfcf07f83\n" }, { "commit": "de8905e4954c86e8e55775b156ea7929f8fd1030", "tree": "9a1f569883ced5f92c9fa3331d15372fda380c6d", "parents": [ "263c4788dcf45f104f8668fd6621d1a7c39689b9", "d22f6a6296b0fc7dee08bc442a54343c1b478a4c" ], "author": { "name": "Qiwen Zhao", "email": "zhao@google.com", "time": "Mon Dec 09 14:17:43 2013 -0800" }, "committer": { "name": "Qiwen Zhao", "email": "zhao@google.com", "time": "Mon Dec 09 14:17:43 2013 -0800" }, "message": "DO NOT MERGE reset to goog/klp-volantis-dev\n" }, { "commit": "263c4788dcf45f104f8668fd6621d1a7c39689b9", "tree": "9a1f569883ced5f92c9fa3331d15372fda380c6d", "parents": [ "0126e9803401a657ea27e8ee8499fb52ca3810a9", "30253d7a649bd4fc6a436ae880a70e1142c1e58f" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Mon Dec 09 18:31:25 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 09 18:31:25 2013 +0000" }, "message": "am 30253d7a: am 2daa0c93: Merge \"Add address flags and scope to LinkAddress.\"\n\n* commit \u002730253d7a649bd4fc6a436ae880a70e1142c1e58f\u0027:\n Add address flags and scope to LinkAddress.\n" }, { "commit": "30253d7a649bd4fc6a436ae880a70e1142c1e58f", "tree": "9a1f569883ced5f92c9fa3331d15372fda380c6d", "parents": [ "19158fc39a40f51c87195f5e3066bd891d359a2e", "2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Mon Dec 09 10:28:19 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 09 10:28:19 2013 -0800" }, "message": "am 2daa0c93: Merge \"Add address flags and scope to LinkAddress.\"\n\n* commit \u00272daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2\u0027:\n Add address flags and scope to LinkAddress.\n" }, { "commit": "0126e9803401a657ea27e8ee8499fb52ca3810a9", "tree": "b6ca5a899fc93dfc44c5502eb0d7d744ae4a69b7", "parents": [ "427e05b4afdae4e8b67fe420dad1403fd22d06e7", "19158fc39a40f51c87195f5e3066bd891d359a2e" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Mon Dec 09 18:10:32 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 09 18:10:32 2013 +0000" }, "message": "am 19158fc3: (-s ours) am 325a1352: (-s ours) am 0bfbb676: (-s ours) Import translations. DO NOT MERGE\n\n* commit \u002719158fc39a40f51c87195f5e3066bd891d359a2e\u0027:\n Import translations. DO NOT MERGE\n" }, { "commit": "19158fc39a40f51c87195f5e3066bd891d359a2e", "tree": "b6ca5a899fc93dfc44c5502eb0d7d744ae4a69b7", "parents": [ "6fc956c7ac7602e23f9bf164760db137cebdbbb8", "325a13527d8c18c93bee266475cade9037f71698" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Mon Dec 09 10:08:25 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 09 10:08:25 2013 -0800" }, "message": "am 325a1352: (-s ours) am 0bfbb676: (-s ours) Import translations. DO NOT MERGE\n\n* commit \u0027325a13527d8c18c93bee266475cade9037f71698\u0027:\n Import translations. DO NOT MERGE\n" }, { "commit": "325a13527d8c18c93bee266475cade9037f71698", "tree": "37dbfd05cd8fa5b9b5cad982e4b73608f0d831f4", "parents": [ "4681d4521cb955fcf66b6aad809aa99836cbb30a", "0bfbb676277c907444b09ba9e653491b32dddf9c" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Mon Dec 09 10:05:02 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 09 10:05:02 2013 -0800" }, "message": "am 0bfbb676: (-s ours) Import translations. DO NOT MERGE\n\n* commit \u00270bfbb676277c907444b09ba9e653491b32dddf9c\u0027:\n Import translations. DO NOT MERGE\n" }, { "commit": "0bfbb676277c907444b09ba9e653491b32dddf9c", "tree": "3486ec324c6a982cb0bc72773da8dfff1d04dec8", "parents": [ "6d25c934dcdf7a098d4e9f96cb206789dfd4afb7" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Mon Dec 09 09:53:12 2013 -0800" }, "committer": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Mon Dec 09 09:53:12 2013 -0800" }, "message": "Import translations. DO NOT MERGE\n\nChange-Id: Iaac5bb8f0ee9e7471e6f6401eab46a86a406ce4c\nAuto-generated-cl: translation import\n" }, { "commit": "2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2", "tree": "463582fb243cd98893fe7ca1ca75cda2e1ff7d11", "parents": [ "6b8a3a52acf1c2722551f1ea1ce47831f87939cd", "64483947fdb03bf838e317ac0a4af5e0f53a5bbf" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Sat Dec 07 02:43:02 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Dec 07 02:43:04 2013 +0000" }, "message": "Merge \"Add address flags and scope to LinkAddress.\"" }, { "commit": "427e05b4afdae4e8b67fe420dad1403fd22d06e7", "tree": "b6ca5a899fc93dfc44c5502eb0d7d744ae4a69b7", "parents": [ "cf6c169fe0c2f13784af3559f25acad738b7a0ae", "6fc956c7ac7602e23f9bf164760db137cebdbbb8" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sat Dec 07 01:50:13 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Dec 07 01:50:13 2013 +0000" }, "message": "am 6fc956c7: am 4681d452: am 9cefb571: Merge \"Revert \"add Drive API feature page. fix link text on several pages\"\" into klp-docs\n\n* commit \u00276fc956c7ac7602e23f9bf164760db137cebdbbb8\u0027:\n Revert \"add Drive API feature page. fix link text on several pages\"\n" }, { "commit": "6fc956c7ac7602e23f9bf164760db137cebdbbb8", "tree": "b6ca5a899fc93dfc44c5502eb0d7d744ae4a69b7", "parents": [ "71638ac4afb54bd0f4849c1179c370ee75462565", "4681d4521cb955fcf66b6aad809aa99836cbb30a" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Dec 06 17:48:00 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 06 17:48:00 2013 -0800" }, "message": "am 4681d452: am 9cefb571: Merge \"Revert \"add Drive API feature page. fix link text on several pages\"\" into klp-docs\n\n* commit \u00274681d4521cb955fcf66b6aad809aa99836cbb30a\u0027:\n Revert \"add Drive API feature page. fix link text on several pages\"\n" }, { "commit": "4681d4521cb955fcf66b6aad809aa99836cbb30a", "tree": "37dbfd05cd8fa5b9b5cad982e4b73608f0d831f4", "parents": [ "2c93b68a0309e74e5c011cba1ef98951236f9f29", "9cefb57116653346729a9fc606e8ff4f899ad380" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sat Dec 07 01:45:31 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Dec 07 01:45:31 2013 +0000" }, "message": "am 9cefb571: Merge \"Revert \"add Drive API feature page. fix link text on several pages\"\" into klp-docs\n\n* commit \u00279cefb57116653346729a9fc606e8ff4f899ad380\u0027:\n Revert \"add Drive API feature page. fix link text on several pages\"\n" }, { "commit": "9cefb57116653346729a9fc606e8ff4f899ad380", "tree": "c3da306e4dcbfd22a3020daaa589251f6bcfb7ba", "parents": [ "b821a87d1b9310d7f07880c80d0b5ccafd59986a", "f2be361b46b47cb96473d71b6719f9ed5a70f14e" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sat Dec 07 01:42:30 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Dec 07 01:42:31 2013 +0000" }, "message": "Merge \"Revert \"add Drive API feature page. fix link text on several pages\"\" into klp-docs" }, { "commit": "f2be361b46b47cb96473d71b6719f9ed5a70f14e", "tree": "a53e6abdd032909cf26641e6029f22f6551b5652", "parents": [ "680a1f67cd39b127663d2e8bc4b5f3ca1d868274" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sat Dec 07 01:42:10 2013 +0000" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Sat Dec 07 01:42:10 2013 +0000" }, "message": "Revert \"add Drive API feature page. fix link text on several pages\"\n\nThis reverts commit 680a1f67cd39b127663d2e8bc4b5f3ca1d868274.\n\nChange-Id: Icc474d08e5fba678b683ae01280e015ae38dcf72\n" }, { "commit": "cf6c169fe0c2f13784af3559f25acad738b7a0ae", "tree": "8fb63929008f0c3c18c1b191e0ee8a07db8c3aea", "parents": [ "03775d95a8cb6dd7c9fe471d832e4f7d1400471d", "71638ac4afb54bd0f4849c1179c370ee75462565" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sat Dec 07 00:17:32 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Dec 07 00:17:32 2013 +0000" }, "message": "am 71638ac4: am 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages\n\n* commit \u002771638ac4afb54bd0f4849c1179c370ee75462565\u0027:\n update robots.txt to disallow the community/ pages\n" }, { "commit": "71638ac4afb54bd0f4849c1179c370ee75462565", "tree": "8fb63929008f0c3c18c1b191e0ee8a07db8c3aea", "parents": [ "2bbea2bbc1b0efe60efcb255404661ca5160ab04", "2c93b68a0309e74e5c011cba1ef98951236f9f29" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Dec 06 16:15:15 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 06 16:15:15 2013 -0800" }, "message": "am 2c93b68a: am b821a87d: update robots.txt to disallow the community/ pages\n\n* commit \u00272c93b68a0309e74e5c011cba1ef98951236f9f29\u0027:\n update robots.txt to disallow the community/ pages\n" }, { "commit": "2c93b68a0309e74e5c011cba1ef98951236f9f29", "tree": "a8a977155dea7af9f66eec23b4c4dac39b4f58c5", "parents": [ "38854cabba3524316f8e1a9ffe9f4ac15e14d72f", "b821a87d1b9310d7f07880c80d0b5ccafd59986a" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sat Dec 07 00:12:41 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Dec 07 00:12:41 2013 +0000" }, "message": "am b821a87d: update robots.txt to disallow the community/ pages\n\n* commit \u0027b821a87d1b9310d7f07880c80d0b5ccafd59986a\u0027:\n update robots.txt to disallow the community/ pages\n" }, { "commit": "03775d95a8cb6dd7c9fe471d832e4f7d1400471d", "tree": "6b7289ee1844fa4faed62e0ccdb26e8d0c8f33ab", "parents": [ "41d6be57d3d7cb6fda32398211b826e095e480c4", "2bbea2bbc1b0efe60efcb255404661ca5160ab04" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sat Dec 07 00:11:35 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Dec 07 00:11:35 2013 +0000" }, "message": "am 2bbea2bb: am 38854cab: am c45eebe1: add Android Community page\n\n* commit \u00272bbea2bbc1b0efe60efcb255404661ca5160ab04\u0027:\n add Android Community page\n" }, { "commit": "2bbea2bbc1b0efe60efcb255404661ca5160ab04", "tree": "6b7289ee1844fa4faed62e0ccdb26e8d0c8f33ab", "parents": [ "2d2853120eaf3ccd6867ec7038c38ef794baaecc", "38854cabba3524316f8e1a9ffe9f4ac15e14d72f" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Dec 06 16:09:24 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 06 16:09:24 2013 -0800" }, "message": "am 38854cab: am c45eebe1: add Android Community page\n\n* commit \u002738854cabba3524316f8e1a9ffe9f4ac15e14d72f\u0027:\n add Android Community page\n" }, { "commit": "b821a87d1b9310d7f07880c80d0b5ccafd59986a", "tree": "5312f9040587605ea6729cf66c720f31254c889d", "parents": [ "c45eebe1868deb93c54c29885163a13a497eb86a" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Dec 06 16:08:01 2013 -0800" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Dec 06 16:08:01 2013 -0800" }, "message": "update robots.txt to disallow the community/ pages\n\nChange-Id: I318308f7219b296d92039cba2b6f5ace321f697f\n" }, { "commit": "38854cabba3524316f8e1a9ffe9f4ac15e14d72f", "tree": "cb559c9dd1d593ca9f1277816bc589d1313d5ce0", "parents": [ "37a8d7c54cbdb36cd6ff9c6688140b99e256c644", "c45eebe1868deb93c54c29885163a13a497eb86a" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sat Dec 07 00:06:29 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Dec 07 00:06:29 2013 +0000" }, "message": "am c45eebe1: add Android Community page\n\n* commit \u0027c45eebe1868deb93c54c29885163a13a497eb86a\u0027:\n add Android Community page\n" }, { "commit": "c45eebe1868deb93c54c29885163a13a497eb86a", "tree": "be1f4fe925105a6961515eb5b339cadbc7e9fdfd", "parents": [ "680a1f67cd39b127663d2e8bc4b5f3ca1d868274" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed Dec 04 18:34:19 2013 -0800" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Dec 06 15:48:22 2013 -0800" }, "message": "add Android Community page\n\nChange-Id: I8a9c98931b274dbb27d7952e2278eaf7798da343\n" }, { "commit": "41d6be57d3d7cb6fda32398211b826e095e480c4", "tree": "680b5de88c12b5b3a4d6c113e5c722760e54f495", "parents": [ "bf88b659b6c02143b464c0551d4875f7911ed269", "2d2853120eaf3ccd6867ec7038c38ef794baaecc" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Dec 06 23:44:59 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 06 23:44:59 2013 +0000" }, "message": "am 2d285312: am 37a8d7c5: am 680a1f67: add Drive API feature page. fix link text on several pages\n\n* commit \u00272d2853120eaf3ccd6867ec7038c38ef794baaecc\u0027:\n add Drive API feature page. fix link text on several pages\n" }, { "commit": "2d2853120eaf3ccd6867ec7038c38ef794baaecc", "tree": "680b5de88c12b5b3a4d6c113e5c722760e54f495", "parents": [ "5fa89d55712110c2932f76357216e7a77b3b317e", "37a8d7c54cbdb36cd6ff9c6688140b99e256c644" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Dec 06 15:41:23 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 06 15:41:23 2013 -0800" }, "message": "am 37a8d7c5: am 680a1f67: add Drive API feature page. fix link text on several pages\n\n* commit \u002737a8d7c54cbdb36cd6ff9c6688140b99e256c644\u0027:\n add Drive API feature page. fix link text on several pages\n" }, { "commit": "37a8d7c54cbdb36cd6ff9c6688140b99e256c644", "tree": "ad8d857fb14bc2dfc5b2ad9c5b63a43baf1acebe", "parents": [ "c09e0ee90e00acbde85a6b3ee4413ca6e245f601", "680a1f67cd39b127663d2e8bc4b5f3ca1d868274" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Dec 06 23:38:43 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 06 23:38:43 2013 +0000" }, "message": "am 680a1f67: add Drive API feature page. fix link text on several pages\n\n* commit \u0027680a1f67cd39b127663d2e8bc4b5f3ca1d868274\u0027:\n add Drive API feature page. fix link text on several pages\n" }, { "commit": "680a1f67cd39b127663d2e8bc4b5f3ca1d868274", "tree": "8d5649e94e41e295aa05fcc45a591c76437962c8", "parents": [ "c9cad879597dd15983a35fbf997898a771672a69" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Dec 06 12:57:13 2013 -0800" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Dec 06 14:50:18 2013 -0800" }, "message": "add Drive API feature page.\nfix link text on several pages\n\nChange-Id: I717eba278bc2cc09d3ee148a08700e8e353312d2\n" }, { "commit": "bf88b659b6c02143b464c0551d4875f7911ed269", "tree": "43154de3dd3723f039ce9780808afde7b6f471bd", "parents": [ "dcff5ceff6ef0050af4c49a8c2a86ab663a88665", "5fa89d55712110c2932f76357216e7a77b3b317e" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Dec 06 16:22:58 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 06 16:22:58 2013 +0000" }, "message": "am 5fa89d55: am 6b8a3a52: am f7422885: Merge \"Augment SELinuxMMAC functionality.\"\n\n* commit \u00275fa89d55712110c2932f76357216e7a77b3b317e\u0027:\n Augment SELinuxMMAC functionality.\n" }, { "commit": "5fa89d55712110c2932f76357216e7a77b3b317e", "tree": "43154de3dd3723f039ce9780808afde7b6f471bd", "parents": [ "d7a5aaee145879804006d2c00daa4c14d544e03a", "6b8a3a52acf1c2722551f1ea1ce47831f87939cd" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Dec 06 08:20:18 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 06 08:20:18 2013 -0800" }, "message": "am 6b8a3a52: am f7422885: Merge \"Augment SELinuxMMAC functionality.\"\n\n* commit \u00276b8a3a52acf1c2722551f1ea1ce47831f87939cd\u0027:\n Augment SELinuxMMAC functionality.\n" }, { "commit": "6b8a3a52acf1c2722551f1ea1ce47831f87939cd", "tree": "008704a44c552591a0ebeeba627ebbfc5a3969af", "parents": [ "ebcb32f58a6220802ca129ea33f47b4b69931a10", "f7422885a99c5d240f70c2f8227ae44abeea3e5c" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Dec 06 08:17:23 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 06 08:17:23 2013 -0800" }, "message": "am f7422885: Merge \"Augment SELinuxMMAC functionality.\"\n\n* commit \u0027f7422885a99c5d240f70c2f8227ae44abeea3e5c\u0027:\n Augment SELinuxMMAC functionality.\n" }, { "commit": "f7422885a99c5d240f70c2f8227ae44abeea3e5c", "tree": "1371ff27a0b08401d7f844d837589f16447205ed", "parents": [ "6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41", "99a626c2719e1965364fad543101799f527e28ca" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri Dec 06 16:13:58 2013 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 06 16:13:58 2013 +0000" }, "message": "Merge \"Augment SELinuxMMAC functionality.\"" }, { "commit": "99a626c2719e1965364fad543101799f527e28ca", "tree": "1371ff27a0b08401d7f844d837589f16447205ed", "parents": [ "6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41" ], "author": { "name": "Robert Craig", "email": "rpcraig@tycho.ncsc.mil", "time": "Mon Dec 02 10:24:23 2013 -0500" }, "committer": { "name": "Robert Craig", "email": "rpcraig@tycho.ncsc.mil", "time": "Fri Dec 06 08:51:20 2013 -0500" }, "message": "Augment SELinuxMMAC functionality.\n\n* No longer support a package name stanza outside of\n a signature tag. Package names, by themselves, have\n no security associated with them in Android and thus we\n should not be allowing or encouraging this\n type of policy.\n\n* Allow for nested package name stanzas inside\n signature stanzas. There are cases where a finer\n distinction needs to be made among apps signed with\n the same cert. New code allows a different seinfo\n tag to be assigned to the listed package names\n signed by the parent cert. When a determination needs\n to be made concerning seinfo assignments, the inner\n seinfo tag takes precedence over the outer seinfo\n labels which are assigned to just the signature.\n\n* Temp structures are now used to parse new policy files\n until the entire xml file is parsed and deemed correct,\n at which time the temp structures are copied over to the\n permanent class structures. This ensures that any structural\n errors with the policy will not result in partial loads.\n\n* Valid stanzas look like the following with the inner\n package piece being optional.\n\n \u003csigner signature\u003d\"\"\u003e\n \u003cseinfo value\u003d\"\"/\u003e\n \u003cpackage name\u003d\"\"\u003e\n \u003cseinfo value\u003d\"\"/\u003e\n \u003c/package\u003e\n \u003csigner\u003e\n\n \u003cdefault\u003e\n \u003cseinfo value\u003d\"\"/\u003e\n \u003c/default\u003e\n\nChange-Id: Ia204d71211776dcf9b2dcc86ad6d77c4ad39dc25\n" }, { "commit": "64483947fdb03bf838e317ac0a4af5e0f53a5bbf", "tree": "856dbc2a83c5b1586b1127e0b3c14f6f335a30fc", "parents": [ "6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41" ], "author": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Nov 15 18:43:52 2013 +0900" }, "committer": { "name": "Lorenzo Colitti", "email": "lorenzo@google.com", "time": "Fri Dec 06 13:54:35 2013 +0900" }, "message": "Add address flags and scope to LinkAddress.\n\nThis is necessary so that the framework can know whether an IPv6\naddress is likely to be usable (i.e., if it\u0027s global scope and\npreferred). Also, it will simplify the address notification\nmethods in INetworkManagementEventObserver, which currently take\nthe address, the flags, and the scope as separate arguments.\n\n1. Add flags and scope to the class and update the unit test.\n Use the IFA_F_* and RT_SCOPE_* constants defined by libcore.\n Since most callers don\u0027t know about flags and scope, provide\n constructors that default the flags to zero and determine the\n scope from the address. Addresses notified by the kernel will\n have these properly set. Make multicast addresses invalid.\n Update the class documentation.\n2. Provide an isSameAddressAs() method that compares only the\n address and prefix information between two LinkAddress\n objects. This is necessary because an interface can\u0027t have\n two addresses with the same address/prefix but different\n flags.\n3. Update LinkProperties\u0027s addLinkAddress and removeLinkAddress\n to identify existing addresses to add/remove using\n isSameAddressAs instead of implicit equals(). Specifically:\n - If addLinkAddress is called with an address that is already\n present, the existing address\u0027s flags and scope are updated.\n This allows, for example, an address on an interface to go\n from preferred to deprecated when it expires, without it\n having to be removed and re-added.\n - If removeLinkAddress is called with an address that is\n present but with different flags, it deletes that address\n instead of failing to find a match.\n4. Update the INetworkManagementEventObserver address\n notification methods to take just a LinkAddress instead of\n LinkAddress, flags, and scope. While I\u0027m at it, change the\n order of the arguments for consistency with the other\n functions in the interface.\n\nChange-Id: Id8fe0f09a7e8f6bee1ea3b52102178b689a9336e\n" }, { "commit": "dcff5ceff6ef0050af4c49a8c2a86ab663a88665", "tree": "f56d5c4765e02e9d7c30d1751368473cdd58c738", "parents": [ "7a15f93228b455a731946d4894abdc45be8b164b", "d7a5aaee145879804006d2c00daa4c14d544e03a" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri Dec 06 01:43:38 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 06 01:43:38 2013 +0000" }, "message": "am d7a5aaee: am ebcb32f5: Merge commit \\\u0027bac61807d3bcfff957b358cb9ad77850bd373689\\\u0027 into HEAD\n\n* commit \u0027d7a5aaee145879804006d2c00daa4c14d544e03a\u0027:\n" }, { "commit": "d7a5aaee145879804006d2c00daa4c14d544e03a", "tree": "f56d5c4765e02e9d7c30d1751368473cdd58c738", "parents": [ "babea8d8f2d4b3a40ab4e37646c26783c2288e87", "ebcb32f58a6220802ca129ea33f47b4b69931a10" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Dec 05 17:27:10 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 17:27:10 2013 -0800" }, "message": "am ebcb32f5: Merge commit \\\u0027bac61807d3bcfff957b358cb9ad77850bd373689\\\u0027 into HEAD\n\n* commit \u0027ebcb32f58a6220802ca129ea33f47b4b69931a10\u0027:\n" }, { "commit": "d22f6a6296b0fc7dee08bc442a54343c1b478a4c", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "4830bc50848e3c575e74ef9c996821af45943cf7", "61c9706bac583a1cf95be12d7f5e96f652669d72" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Thu Dec 05 21:30:08 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:30:08 2013 +0000" }, "message": "am 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge \"Import translations. DO NOT MERGE\" into klp-dev\n\n* commit \u002761c9706bac583a1cf95be12d7f5e96f652669d72\u0027:\n" }, { "commit": "4830bc50848e3c575e74ef9c996821af45943cf7", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "335289aae79b5dc759629a89b97bf059a3d1e466", "dc5f592c0344e9fc308c68d7d2e80b8b7f82acab" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Thu Dec 05 21:30:03 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:30:03 2013 +0000" }, "message": "am dc5f592c: (-s ours) am 78f5ef71: (-s ours) Merge \"Import translations. DO NOT MERGE\" into klp-dev\n\n* commit \u0027dc5f592c0344e9fc308c68d7d2e80b8b7f82acab\u0027:\n" }, { "commit": "335289aae79b5dc759629a89b97bf059a3d1e466", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "758485f003844b9426a6883f43f7354c3f8a4bfd", "51843f8aa9a76207627288252a99f12141195a07" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 05 21:29:54 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:29:54 2013 +0000" }, "message": "am 51843f8a: am 371c46fe: Merge \"Remove exceptions from the printer discovery session APIs.\" into klp-dev\n\n* commit \u002751843f8aa9a76207627288252a99f12141195a07\u0027:\n" }, { "commit": "758485f003844b9426a6883f43f7354c3f8a4bfd", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "e4fdda2793bd1bd44259ae685d76ac4323a4de5e", "0d27bc294610d7415093804a20d380f2e78bd30b" ], "author": { "name": "Jose Lima", "email": "joselima@google.com", "time": "Thu Dec 05 21:29:40 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:29:40 2013 +0000" }, "message": "am 0d27bc29: am 56e0d6b8: Merge \"Allow configuration of Toast gravity settings\" into klp-dev\n\n* commit \u00270d27bc294610d7415093804a20d380f2e78bd30b\u0027:\n" }, { "commit": "e4fdda2793bd1bd44259ae685d76ac4323a4de5e", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "44e0da4ebc2107d1bf92465bf9a1245da874ef0c", "8810a0c3c242ab0ac252261d7f73258769cc9f2d" ], "author": { "name": "David Christie", "email": "dnchrist@google.com", "time": "Thu Dec 05 21:29:25 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:29:25 2013 +0000" }, "message": "am 8810a0c3: am 69b9eff1: Merge \"Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the \"master location switch\" means. Quick settings will no longeer explicitly enable/disable gps and network prov\n\n* commit \u00278810a0c3c242ab0ac252261d7f73258769cc9f2d\u0027:\n" }, { "commit": "44e0da4ebc2107d1bf92465bf9a1245da874ef0c", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "ba690f48b95010f096c4df04b5fec91bf6bf73c7", "c319ddd9ec9c630840a11765a4630b1375fe9664" ], "author": { "name": "Kristian Monsen", "email": "kristianm@google.com", "time": "Thu Dec 05 21:29:16 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:29:16 2013 +0000" }, "message": "am c319ddd9: am 4c737496: Merge \"Change the exception msg\" into klp-dev\n\n* commit \u0027c319ddd9ec9c630840a11765a4630b1375fe9664\u0027:\n" }, { "commit": "ba690f48b95010f096c4df04b5fec91bf6bf73c7", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "44894df5d79500ade82cc8f250cc8fe70b28af87", "f76c1685a55302e95086818b5178d9af257b3e4f" ], "author": { "name": "Vinit Deshapnde", "email": "vinitd@google.com", "time": "Thu Dec 05 21:29:03 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:29:03 2013 +0000" }, "message": "am f76c1685: am 049cbd64: Merge \"Fix a bug in single socket connection to Wifi Supplicant\" into klp-dev\n\n* commit \u0027f76c1685a55302e95086818b5178d9af257b3e4f\u0027:\n" }, { "commit": "44894df5d79500ade82cc8f250cc8fe70b28af87", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "054a7f5cba275b929c60b17128c13026cbdcd154", "72d29c2d0d062122710e4d3d4eed68f04be3b275" ], "author": { "name": "keunyoung", "email": "keunyoung@google.com", "time": "Thu Dec 05 21:28:57 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:28:57 2013 +0000" }, "message": "am 72d29c2d: am ddbfdfa5: Merge \"fix race condition when a new display is added\" into klp-dev\n\n* commit \u002772d29c2d0d062122710e4d3d4eed68f04be3b275\u0027:\n" }, { "commit": "054a7f5cba275b929c60b17128c13026cbdcd154", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "5126f194c08dcb230a74c5be1ceaf094d92f759e", "aad62128100f0c1562f9c61a721b703480ed3772" ], "author": { "name": "Michael Wright", "email": "michaelwr@google.com", "time": "Thu Dec 05 21:28:41 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:28:41 2013 +0000" }, "message": "am aad62128: am 51b4a40e: Merge \"Expose vendor and product IDs for InputDevices\" into klp-dev\n\n* commit \u0027aad62128100f0c1562f9c61a721b703480ed3772\u0027:\n" }, { "commit": "5126f194c08dcb230a74c5be1ceaf094d92f759e", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "1668ebf484d194156d12e2fb791bea39e7742074", "4b982e49751c87bc4d55c3ab59958904ad9f701b" ], "author": { "name": "Victoria Lease", "email": "violets@google.com", "time": "Thu Dec 05 21:28:16 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:28:16 2013 +0000" }, "message": "am 4b982e49: am ebec4b6e: Merge \"fix kBW_Format glyphs\" into klp-dev\n\n* commit \u00274b982e49751c87bc4d55c3ab59958904ad9f701b\u0027:\n" }, { "commit": "1668ebf484d194156d12e2fb791bea39e7742074", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "f5a89a2bb3fa4c48787d5c8c5f6fdec5005c0456", "76bf4d6dbee90268ecdf5eab63a9048fcaa8ff02" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Thu Dec 05 21:27:56 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:27:56 2013 +0000" }, "message": "am 76bf4d6d: am d1f6b624: Merge \"Take text alignment into account to compue text bounds Bug #10258621\" into klp-dev\n\n* commit \u002776bf4d6dbee90268ecdf5eab63a9048fcaa8ff02\u0027:\n" }, { "commit": "f5a89a2bb3fa4c48787d5c8c5f6fdec5005c0456", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "ae2b398150a2ed66866aef2c3781020e1ca9f059", "1e68ffc72fda060b316f0cf6d2a310a601965577" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Dec 05 21:27:48 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:27:48 2013 +0000" }, "message": "am 1e68ffc7: am 890db42b: Merge \"Not create context menu when mouse right click outside list/grid items\" into klp-dev\n\n* commit \u00271e68ffc72fda060b316f0cf6d2a310a601965577\u0027:\n" }, { "commit": "ae2b398150a2ed66866aef2c3781020e1ca9f059", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "a004f72cf00555aa2694b97ff6c17b97397cd471", "beb7b44962b7dfd2a9d4cc56ec6417037ffff862" ], "author": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Thu Dec 05 21:27:39 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 21:27:39 2013 +0000" }, "message": "am beb7b449: am b9b1701d: Merge \"Make PrintFileDocumentAdapter non-final.\" into klp-dev\n\n* commit \u0027beb7b44962b7dfd2a9d4cc56ec6417037ffff862\u0027:\n" }, { "commit": "ebcb32f58a6220802ca129ea33f47b4b69931a10", "tree": "32b57c1d6ba9180ae63979e06d7421e107a9aa6c", "parents": [ "6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41", "bac61807d3bcfff957b358cb9ad77850bd373689" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Dec 05 13:10:46 2013 -0800" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Dec 05 13:10:46 2013 -0800" }, "message": "Merge commit \u0027bac61807d3bcfff957b358cb9ad77850bd373689\u0027 into HEAD\n\nChange-Id: I29374270c8e0c2f2859efaf1d55af9f73da0f8d7\n" }, { "commit": "7a15f93228b455a731946d4894abdc45be8b164b", "tree": "f56d5c4765e02e9d7c30d1751368473cdd58c738", "parents": [ "ceddb389b4a1751399a0b1ad3198008011a5397a", "babea8d8f2d4b3a40ab4e37646c26783c2288e87" ], "author": { "name": "Ying Wang", "email": "wangying@android.com", "time": "Thu Dec 05 20:33:43 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 20:33:43 2013 +0000" }, "message": "am babea8d8: am 6e2d0c1d: Merge \"wifi: Remove obsolete libwpa_client library\"\n\n* commit \u0027babea8d8f2d4b3a40ab4e37646c26783c2288e87\u0027:\n wifi: Remove obsolete libwpa_client library\n" }, { "commit": "babea8d8f2d4b3a40ab4e37646c26783c2288e87", "tree": "f56d5c4765e02e9d7c30d1751368473cdd58c738", "parents": [ "b33fe50a634e4fde635f7e662526db1c3e2cfa5c", "6e2d0c1d91f644ab50e0c0b7cae4306262a4ca41" ], "author": { "name": "Ying Wang", "email": "wangying@android.com", "time": "Thu Dec 05 12:29:12 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 12:29:12 2013 -0800" }, "message": "am 6e2d0c1d: Merge \"wifi: Remove obsolete libwpa_client library\"\n\n* commit \u00276e2d0c1d91f644ab50e0c0b7cae4306262a4ca41\u0027:\n wifi: Remove obsolete libwpa_client library\n" }, { "commit": "a004f72cf00555aa2694b97ff6c17b97397cd471", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "7a9ec2cd8d00c906603c5cb88625c97b47378947", "54276ad3dabc9c1ccafb67b621a8d0f3960820c9" ], "author": { "name": "Chet Haase", "email": "chet@google.com", "time": "Thu Dec 05 19:47:27 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:47:27 2013 +0000" }, "message": "am 54276ad3: am cd89feb9: Merge \"pause/resume for Animators\" into klp-dev\n\n* commit \u002754276ad3dabc9c1ccafb67b621a8d0f3960820c9\u0027:\n" }, { "commit": "7a9ec2cd8d00c906603c5cb88625c97b47378947", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "6acc2743ee24268b1919c4eb25bb1437b0379fec", "afa1231e75f8808f17eccdef51bce98100364521" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Dec 05 19:47:14 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:47:14 2013 +0000" }, "message": "am afa1231e: am b6da9115: Merge \"Remove incorrect warning.\" into klp-dev\n\n* commit \u0027afa1231e75f8808f17eccdef51bce98100364521\u0027:\n" }, { "commit": "6acc2743ee24268b1919c4eb25bb1437b0379fec", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "aff9c48759619c4025927fec4cdf6d5e274db144", "dfa36da5ca9b614a0ad5e69b008920e64c0d8356" ], "author": { "name": "Katie McCormick", "email": "kmccormick@google.com", "time": "Thu Dec 05 19:47:06 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:47:06 2013 +0000" }, "message": "am dfa36da5: am 076d3787: am 6441b9bd: am e5007896: am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\\\u0027s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb\n\n* commit \u0027dfa36da5ca9b614a0ad5e69b008920e64c0d8356\u0027:\n" }, { "commit": "aff9c48759619c4025927fec4cdf6d5e274db144", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "9b7bf2ba1e9f3017a4edc498f455091935d675ab", "ff1b3f0789f014b4ce7e2cd47c4d47e3f70fe484" ], "author": { "name": "Selim Gurun", "email": "sgurun@google.com", "time": "Thu Dec 05 19:46:51 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:46:51 2013 +0000" }, "message": "am ff1b3f07: am 1232c51e: Merge \"Add the API to support webview printing\" into klp-dev\n\n* commit \u0027ff1b3f0789f014b4ce7e2cd47c4d47e3f70fe484\u0027:\n" }, { "commit": "9b7bf2ba1e9f3017a4edc498f455091935d675ab", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "d7889768b1bbb78e15ddc96575180252f1b4a5cf", "98e50c50f52b045d944df2eee0987d06eb1af07d" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Thu Dec 05 19:46:34 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:46:34 2013 +0000" }, "message": "am 98e50c50: am 964f2b30: Merge \"Update Bitmap.createBitmap() documentation\" into klp-dev\n\n* commit \u002798e50c50f52b045d944df2eee0987d06eb1af07d\u0027:\n" }, { "commit": "d7889768b1bbb78e15ddc96575180252f1b4a5cf", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "6fa95b46ec7d2a267aa0b732a460588d7c75efcb", "07b9b3ad3b4d942b4ed920cfa8f68bce71686972" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Dec 05 19:46:20 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:46:20 2013 +0000" }, "message": "am 07b9b3ad: am b45b39a2: am cdf3455c: am 6dd38cc5: Revert \"Revert \"resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev\" revert to fix conflicts, i\\\u0027ll fix it all later.\"\n\n* commit \u002707b9b3ad3b4d942b4ed920cfa8f68bce71686972\u0027:\n" }, { "commit": "6fa95b46ec7d2a267aa0b732a460588d7c75efcb", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "2717e4eabe581d4f461918f78fead736f65667ae", "93e5dc65811b146612d383cec502b6ba04a0e3d5" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Dec 05 19:45:59 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:45:59 2013 +0000" }, "message": "am 93e5dc65: am fefff422: am 7466b998: am ebcee197: Revert \"resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev\" revert to fix conflicts, i\\\u0027ll fix it all later.\n\n* commit \u002793e5dc65811b146612d383cec502b6ba04a0e3d5\u0027:\n" }, { "commit": "2717e4eabe581d4f461918f78fead736f65667ae", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "1d4ddb05e609b2f04aec16c1a06edad1c2232741", "cee3a2a59e9be1b875a81b6c3e885b39e16259e0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 05 19:45:41 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:45:41 2013 +0000" }, "message": "am cee3a2a5: am 8d5f3e31: Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef\n\n* commit \u0027cee3a2a59e9be1b875a81b6c3e885b39e16259e0\u0027:\n" }, { "commit": "1d4ddb05e609b2f04aec16c1a06edad1c2232741", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "231fb187f5b29bf0a1d377e18a9b44b15fd86244", "f8d747b3fd19e8dd9a09b517716b17f852d01343" ], "author": { "name": "Martin Kosiba", "email": "mkosiba@google.com", "time": "Thu Dec 05 19:44:50 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:44:50 2013 +0000" }, "message": "am f8d747b3: (-s ours) am 9a68f82f: Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE\n\n* commit \u0027f8d747b3fd19e8dd9a09b517716b17f852d01343\u0027:\n" }, { "commit": "231fb187f5b29bf0a1d377e18a9b44b15fd86244", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "20861b8f16015c5e5b89bdc8025cc311aeff6883", "4826434cfdb44e5cca6e4bf9c62ee9b005b71a00" ], "author": { "name": "Ben Murdoch", "email": "benm@google.com", "time": "Thu Dec 05 19:44:42 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:44:42 2013 +0000" }, "message": "am 4826434c: am ed735c9a: Add missing cleanspec\n\n* commit \u00274826434cfdb44e5cca6e4bf9c62ee9b005b71a00\u0027:\n" }, { "commit": "20861b8f16015c5e5b89bdc8025cc311aeff6883", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "49ab0f1636833270019b3c1ed733b0a4129f08be", "35d525c9b7de893fc30d7ac531769a36676ed5cb" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Dec 05 19:44:32 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:44:32 2013 +0000" }, "message": "am 35d525c9: am 998cfa2c: Merge \"API to discover granted Uri permissions.\" into klp-dev\n\n* commit \u002735d525c9b7de893fc30d7ac531769a36676ed5cb\u0027:\n" }, { "commit": "49ab0f1636833270019b3c1ed733b0a4129f08be", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "ccff82ee2f3d44088c4e7dd1de7e11de4150b63a", "34412965f1545eaff6bb46e596f2d7ddbac7a1ab" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Dec 05 19:44:24 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:44:24 2013 +0000" }, "message": "am 34412965: am c2f8da87: Merge \"Bring along BridgeContext for the ride.\" into klp-dev\n\n* commit \u002734412965f1545eaff6bb46e596f2d7ddbac7a1ab\u0027:\n" }, { "commit": "ccff82ee2f3d44088c4e7dd1de7e11de4150b63a", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "134f1e9bdc0922e6e0a6c14978712736797ff04f", "0c305430e8945f8e97ba2ce69fcbb07b903c110a" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Dec 05 19:44:16 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:44:16 2013 +0000" }, "message": "am 0c305430: am 436b6ee3: Merge \"Catch a few extra users of UserEnvironment.\" into klp-dev\n\n* commit \u00270c305430e8945f8e97ba2ce69fcbb07b903c110a\u0027:\n" }, { "commit": "134f1e9bdc0922e6e0a6c14978712736797ff04f", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "892c8f3d633301b2c6efa5ca38dd375c907612a3", "1d685ec0610c2047d28e59eed19ceac744146e25" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Dec 05 19:44:08 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:44:08 2013 +0000" }, "message": "am 1d685ec0: am 6e14b22c: Merge \"APIs for multiple external storage devices.\" into klp-dev\n\n* commit \u00271d685ec0610c2047d28e59eed19ceac744146e25\u0027:\n" }, { "commit": "892c8f3d633301b2c6efa5ca38dd375c907612a3", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "ee6556abc93f40955a745b0d2c3329d731c360b4", "098480310f19ff83cb6c97e06deeba67326d15e2" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 05 19:44:01 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:44:01 2013 +0000" }, "message": "am 09848031: am b8160401: Merge \"Fix the build\" into klp-dev\n\n* commit \u0027098480310f19ff83cb6c97e06deeba67326d15e2\u0027:\n" }, { "commit": "ee6556abc93f40955a745b0d2c3329d731c360b4", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "61dce5799a9b037a1ce4d1e723453211391e9237", "e1c2dfeebd5f8befd69ab6ec4801436a325071e5" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu Dec 05 19:43:53 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:43:53 2013 +0000" }, "message": "am e1c2dfee: am c7c4d6dd: Merge \"Refinement of the print service APIs.\" into klp-dev\n\n* commit \u0027e1c2dfeebd5f8befd69ab6ec4801436a325071e5\u0027:\n" }, { "commit": "61dce5799a9b037a1ce4d1e723453211391e9237", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "0816267f70c9ef14e31f49ffd9bdf4c38a917f48", "b802921422b955b83b9fbf1d547cac9300dceddb" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Dec 05 19:43:37 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:43:37 2013 +0000" }, "message": "am b8029214: am 0dd303cf: Merge \"Put animation background behind visible wallpaper\" into klp-dev\n\n* commit \u0027b802921422b955b83b9fbf1d547cac9300dceddb\u0027:\n" }, { "commit": "0816267f70c9ef14e31f49ffd9bdf4c38a917f48", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "980ae54d3c1dec8e5e620b9e471fed98402b888c", "a9f2faa9a7e7539b71b342d1923cfbc14c7e6bbd" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Thu Dec 05 19:43:28 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:43:28 2013 +0000" }, "message": "am a9f2faa9: am a48ad8bd: PROXY_SERVICE may be missing and its reference null.\n\n* commit \u0027a9f2faa9a7e7539b71b342d1923cfbc14c7e6bbd\u0027:\n" }, { "commit": "980ae54d3c1dec8e5e620b9e471fed98402b888c", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "8725106123f62cb5057beaba65f3c013b4e5a140", "2954c1b95bcb01691d639728e7ec87453ed5b1d2" ], "author": { "name": "Katie McCormick", "email": "kmccormick@google.com", "time": "Thu Dec 05 19:43:18 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:43:18 2013 +0000" }, "message": "am 2954c1b9: am 7a7c35e2: am 94c529b8: am 385bb2eb: resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev\n\n* commit \u00272954c1b95bcb01691d639728e7ec87453ed5b1d2\u0027:\n" }, { "commit": "8725106123f62cb5057beaba65f3c013b4e5a140", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "5174a7a05e8b80b9e6fd9420ca781c2fe494bcc0", "71716cc5202550900271b83e8993a111f99dd7fd" ], "author": { "name": "Zhihai Xu", "email": "zhihaixu@google.com", "time": "Thu Dec 05 19:43:09 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:43:09 2013 +0000" }, "message": "am 71716cc5: am 97aaa8f0: Merge \"Bluetooth MAP profile - sms and mms support initial check-in\" into klp-dev\n\n* commit \u002771716cc5202550900271b83e8993a111f99dd7fd\u0027:\n" }, { "commit": "5174a7a05e8b80b9e6fd9420ca781c2fe494bcc0", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "3edd90d47d89332235a260f2b0787789571b2848", "1b90bdf2fe6de9fa51be47a81d6d220e26291e02" ], "author": { "name": "destradaa", "email": "destradaa@google.com", "time": "Thu Dec 05 19:42:52 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:42:52 2013 +0000" }, "message": "am 1b90bdf2: am f910d320: Merge \"Address Robin\\\u0027s code review comments in initial FlpHal submission.\" into klp-dev\n\n* commit \u00271b90bdf2fe6de9fa51be47a81d6d220e26291e02\u0027:\n" }, { "commit": "3edd90d47d89332235a260f2b0787789571b2848", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "5d6930fe4ea0c24f6e1fde4a250cfb941311ed7b", "8e4e7a20f35fb0d44eee3217603dcd50f5579ca1" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Dec 05 19:42:43 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:42:43 2013 +0000" }, "message": "am 8e4e7a20: am 35786c34: Merge \"Allow bound processes to go PROCESS_STATE_TOP.\" into klp-dev\n\n* commit \u00278e4e7a20f35fb0d44eee3217603dcd50f5579ca1\u0027:\n" }, { "commit": "5d6930fe4ea0c24f6e1fde4a250cfb941311ed7b", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "e6eae1609e73205edd560846a032c89dabe9827f", "c70629f137e9a7be757f32b2344616e8f88b57c3" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Thu Dec 05 19:41:37 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:41:37 2013 +0000" }, "message": "am c70629f1: am 583ed765: Merge \"Take shadow bounds into account for quick rejects Bug #8634346\" into klp-dev\n\n* commit \u0027c70629f137e9a7be757f32b2344616e8f88b57c3\u0027:\n" }, { "commit": "e6eae1609e73205edd560846a032c89dabe9827f", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "1612eac06df6ce849cb95935c70ba94093f8d321", "2d1716a8cdc95977c243fe8a642b41f42be565d0" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Thu Dec 05 19:41:24 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:41:24 2013 +0000" }, "message": "am 2d1716a8: (-s ours) am 67d5c290: (-s ours) Merge \"Import translations. DO NOT MERGE\" into klp-dev\n\n* commit \u00272d1716a8cdc95977c243fe8a642b41f42be565d0\u0027:\n" }, { "commit": "1612eac06df6ce849cb95935c70ba94093f8d321", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "8c1df1b24a5dd80174a548f30e9da0faf57d5ae9", "06c2bad60079099b2496f2939655b72ffc649b29" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Thu Dec 05 19:41:14 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:41:14 2013 +0000" }, "message": "am 06c2bad6: am 96aadf83: Merge \"Prevent AsyncTask from creating too many threads Bug #10228005\" into klp-dev\n\n* commit \u002706c2bad60079099b2496f2939655b72ffc649b29\u0027:\n" }, { "commit": "8c1df1b24a5dd80174a548f30e9da0faf57d5ae9", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "a6872c84027552661937aad7f4aa109a174eb23f", "4b643f0ebb78a554d4460626e5dedd4398b11f0a" ], "author": { "name": "Baligh Uddin", "email": "baligh@google.com", "time": "Thu Dec 05 19:40:56 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:40:56 2013 +0000" }, "message": "am 4b643f0e: (-s ours) am 40885045: (-s ours) Merge \"Import translations. DO NOT MERGE\" into klp-dev\n\n* commit \u00274b643f0ebb78a554d4460626e5dedd4398b11f0a\u0027:\n" }, { "commit": "a6872c84027552661937aad7f4aa109a174eb23f", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "fb113bd71d22c32c0edc7b3da0afdbe5e38db9e6", "d021b6b14a801cce1b575d536323af65587f2fbe" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Dec 05 19:40:33 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:40:33 2013 +0000" }, "message": "am d021b6b1: am b0037316: Merge \"More stuff I need for the proc stats UI.\" into klp-dev\n\n* commit \u0027d021b6b14a801cce1b575d536323af65587f2fbe\u0027:\n" }, { "commit": "fb113bd71d22c32c0edc7b3da0afdbe5e38db9e6", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "3ecda6727db8ab035abc18a0e1505faec648c685", "1719817211743cabf53e06761ad5540518544273" ], "author": { "name": "Chet Haase", "email": "chet@google.com", "time": "Thu Dec 05 19:40:25 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:40:25 2013 +0000" }, "message": "am 17198172: am 2b2d313e: Merge \"Reduce amount of invalidation when old-style animations are running\" into klp-dev\n\n* commit \u00271719817211743cabf53e06761ad5540518544273\u0027:\n" }, { "commit": "3ecda6727db8ab035abc18a0e1505faec648c685", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "cf5e3137023edf6360f78161dc704b24e8026c49", "c9bf4052c71d7f473c781363bc7ff757a427c0e3" ], "author": { "name": "keunyoung", "email": "keunyoung@google.com", "time": "Thu Dec 05 19:39:46 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:39:46 2013 +0000" }, "message": "am c9bf4052: am f6c7a5fd: Merge \"add local focus mode and input event injection API to Window\" into klp-dev\n\n* commit \u0027c9bf4052c71d7f473c781363bc7ff757a427c0e3\u0027:\n" }, { "commit": "cf5e3137023edf6360f78161dc704b24e8026c49", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "9cdbcbadeb56041f4122343cbb2fe5d8026924d5", "f2424907b7763c996ef40eb1ef7a02d9a4c5bff9" ], "author": { "name": "Craig Mautner", "email": "cmautner@google.com", "time": "Thu Dec 05 19:39:25 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:39:25 2013 +0000" }, "message": "am f2424907: am 52f8ef21: Merge \"Add extra layout pass after draw finished.\" into klp-dev\n\n* commit \u0027f2424907b7763c996ef40eb1ef7a02d9a4c5bff9\u0027:\n" }, { "commit": "9cdbcbadeb56041f4122343cbb2fe5d8026924d5", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "e6a7f2c197d60849c8ef56b1fb24b30d1fca0d04", "00b581de0e3ef49ea10c5ff039d272df086750e6" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Dec 05 19:39:17 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:39:17 2013 +0000" }, "message": "am 00b581de: am dd78a0fb: Merge \"parse named anonymous memory for dumpsys meminfo\" into klp-dev\n\n* commit \u002700b581de0e3ef49ea10c5ff039d272df086750e6\u0027:\n" }, { "commit": "e6a7f2c197d60849c8ef56b1fb24b30d1fca0d04", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "3b59a3345ea9d4f77a08741572d3ca4533cd216c", "b59dbedceddc18e94fa75fe87523cf026e4e79b6" ], "author": { "name": "Martijn Coenen", "email": "maco@google.com", "time": "Thu Dec 05 19:39:09 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:39:09 2013 +0000" }, "message": "am b59dbedc: am 4bcc8ee6: Merge \"NFC: always upper-case parsed AIDs.\" into klp-dev\n\n* commit \u0027b59dbedceddc18e94fa75fe87523cf026e4e79b6\u0027:\n" }, { "commit": "3b59a3345ea9d4f77a08741572d3ca4533cd216c", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "91e1cb99a8f32fcd8172f9e2c95c3ff414c0c031", "bd430b250880f8376bb4c59f62c627d90ae14324" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Dec 05 19:39:00 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:39:00 2013 +0000" }, "message": "am bd430b25: am be11c364: Merge \"Fix padding adjustment for scrollbars in View, FastScroller\" into klp-dev\n\n* commit \u0027bd430b250880f8376bb4c59f62c627d90ae14324\u0027:\n" }, { "commit": "91e1cb99a8f32fcd8172f9e2c95c3ff414c0c031", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "9fe98de0a9f21c0e190362c9c03563dfb241ba52", "d1715fdaaf2a11484e6dc60710f13e2495cf6bbb" ], "author": { "name": "Geoffrey Borggaard", "email": "geoffreyb@google.com", "time": "Thu Dec 05 19:38:52 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:38:52 2013 +0000" }, "message": "am d1715fda: am 9b59e5aa: Merge \"Add a name to the DeviceOwner\" into klp-dev\n\n* commit \u0027d1715fdaaf2a11484e6dc60710f13e2495cf6bbb\u0027:\n" }, { "commit": "9fe98de0a9f21c0e190362c9c03563dfb241ba52", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "e286c012f2e7a71ae6de97a08dfe170fe9a50cd1", "e4e68219ded0920f0e92ecce6e1cf220603942dc" ], "author": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Thu Dec 05 19:38:45 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:38:45 2013 +0000" }, "message": "am e4e68219: am 88dced29: Merge \"Fix bug #10210182 CTS: android.widget.cts.TextViewTest#testDrawableResolution is failing on KLP\" into klp-dev\n\n* commit \u0027e4e68219ded0920f0e92ecce6e1cf220603942dc\u0027:\n" }, { "commit": "e286c012f2e7a71ae6de97a08dfe170fe9a50cd1", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "6317f13e419f0df239de612d29ffda8209c6d6cd", "003b944d495bd8a54b61fa565a268dd2c9c21ba1" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Dec 05 19:38:36 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:38:36 2013 +0000" }, "message": "am 003b944d: am d81a15c6: Merge \"Add method for adding two ProcessStats objects together.\" into klp-dev\n\n* commit \u0027003b944d495bd8a54b61fa565a268dd2c9c21ba1\u0027:\n" }, { "commit": "6317f13e419f0df239de612d29ffda8209c6d6cd", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "d7f6aff9544a5e1e9f553ee75866eaaf9c3e733d", "b945d80c9bb91b90e48add2a4f665de02c63e28c" ], "author": { "name": "Fabrice Di Meglio", "email": "fdimeglio@google.com", "time": "Thu Dec 05 19:38:27 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:38:27 2013 +0000" }, "message": "am b945d80c: am 5af4edef: Merge \"Fix bug #10205316 CTS (KLP): android.graphics tests are failing\" into klp-dev\n\n* commit \u0027b945d80c9bb91b90e48add2a4f665de02c63e28c\u0027:\n" }, { "commit": "d7f6aff9544a5e1e9f553ee75866eaaf9c3e733d", "tree": "a4f6093c1594b8a53778e964599baa3565664215", "parents": [ "0a12834894a90c592e20e69e64e28775537e954a", "795a7decc2e9e547e0cf6291567d427a2a60517a" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Dec 05 19:38:19 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:38:19 2013 +0000" }, "message": "am 795a7dec: am 5adfb21e: am a0b320a6: Merge \"Remove possible leak when exception occurred.\"\n\n* commit \u0027795a7decc2e9e547e0cf6291567d427a2a60517a\u0027:\n Remove possible leak when exception occurred.\n" }, { "commit": "0a12834894a90c592e20e69e64e28775537e954a", "tree": "d4c7f65d63d17434ea04029bf7be76559e30568b", "parents": [ "8df8225d8d5d15946f36e4b818c22d2e59eabe43", "2464fcdf4cb33b5bfc1e4b0d61e3b9e42cffdf46" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Dec 05 19:38:09 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:38:09 2013 +0000" }, "message": "am 2464fcdf: am 5893a97c: Merge \"fix-up dependencies to gl headers\" into klp-dev\n\n* commit \u00272464fcdf4cb33b5bfc1e4b0d61e3b9e42cffdf46\u0027:\n" }, { "commit": "8df8225d8d5d15946f36e4b818c22d2e59eabe43", "tree": "d4c7f65d63d17434ea04029bf7be76559e30568b", "parents": [ "082c81545be6cbdf14bc91bf42b09acf54ab0816", "ac322988339d98665eff9f5937caff9a4eadd9d2" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Thu Dec 05 19:38:03 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:38:03 2013 +0000" }, "message": "am ac322988: am 00312300: Remove an unnecessary allocation\n\n* commit \u0027ac322988339d98665eff9f5937caff9a4eadd9d2\u0027:\n" }, { "commit": "082c81545be6cbdf14bc91bf42b09acf54ab0816", "tree": "d4c7f65d63d17434ea04029bf7be76559e30568b", "parents": [ "0785ccc2ccb5f9401e9a701db0bffd9a9f51cdb0", "1faca4cd10eaff01a575288e8484a72be66f148f" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Dec 05 19:37:44 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:37:44 2013 +0000" }, "message": "am 1faca4cd: am 37ee68fc: Merge \"Always include a default DocumentStack.\" into klp-dev\n\n* commit \u00271faca4cd10eaff01a575288e8484a72be66f148f\u0027:\n" }, { "commit": "0785ccc2ccb5f9401e9a701db0bffd9a9f51cdb0", "tree": "d4c7f65d63d17434ea04029bf7be76559e30568b", "parents": [ "bb76afa9bcf923944786f0ce3ab76c9114cba351", "85dbba82dffd68867623ab7e881f8adb55ff0428" ], "author": { "name": "Svetoslav", "email": "svetoslavganov@google.com", "time": "Thu Dec 05 19:37:27 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:37:27 2013 +0000" }, "message": "am 85dbba82: am d3964489: Merge \"Some hygiene for the touch explorer.\" into klp-dev\n\n* commit \u002785dbba82dffd68867623ab7e881f8adb55ff0428\u0027:\n" }, { "commit": "bb76afa9bcf923944786f0ce3ab76c9114cba351", "tree": "d4c7f65d63d17434ea04029bf7be76559e30568b", "parents": [ "177b89e91102bd58016d9ce474a281e22426e463", "87a61b838c5cc411853317663beaa46539fd56ef" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Thu Dec 05 19:37:20 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:37:20 2013 +0000" }, "message": "am 87a61b83: am 8a65f5b8: Merge \"Allow packages.list access with new GID.\" into klp-dev\n\n* commit \u002787a61b838c5cc411853317663beaa46539fd56ef\u0027:\n" }, { "commit": "177b89e91102bd58016d9ce474a281e22426e463", "tree": "d4c7f65d63d17434ea04029bf7be76559e30568b", "parents": [ "f3aca5f7ca94aad3f0fe7068762474e8e3f98894", "de3ff4b4859a92a19d84b33f5a93a0b3454698e6" ], "author": { "name": "Jonathan Dixon", "email": "joth@google.com", "time": "Thu Dec 05 19:37:12 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:37:12 2013 +0000" }, "message": "am de3ff4b4: am 42773328: Merge \"Refactor Canvas.drawPicture() to delegate to Picture\" into klp-dev\n\n* commit \u0027de3ff4b4859a92a19d84b33f5a93a0b3454698e6\u0027:\n" }, { "commit": "f3aca5f7ca94aad3f0fe7068762474e8e3f98894", "tree": "d4c7f65d63d17434ea04029bf7be76559e30568b", "parents": [ "47dc5a34b9d861e45171591050ee9ee8248031a4", "8418a309a3e228538a2cf921f386326a9afe394b" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Thu Dec 05 19:36:33 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:36:33 2013 +0000" }, "message": "am 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge \"If in a mobile captive portal is detected enable fail fast.\" into jb-mr2-dev\n\n* commit \u00278418a309a3e228538a2cf921f386326a9afe394b\u0027:\n" }, { "commit": "47dc5a34b9d861e45171591050ee9ee8248031a4", "tree": "d4c7f65d63d17434ea04029bf7be76559e30568b", "parents": [ "1535714401035f134f9ac8bc7d6d209eabfdc9b2", "8eec0cbe01064156c52a87592796a4352f31a451" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Thu Dec 05 19:36:10 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:36:10 2013 +0000" }, "message": "am 8eec0cbe: am 292a92e3: am 7c00be48: am 55adb390: am 35152f13: Merge \"Have CaptivePortalTracker use gservices updateable provisioning urls.\" into jb-mr2-dev\n\n* commit \u00278eec0cbe01064156c52a87592796a4352f31a451\u0027:\n" }, { "commit": "1535714401035f134f9ac8bc7d6d209eabfdc9b2", "tree": "d4c7f65d63d17434ea04029bf7be76559e30568b", "parents": [ "cc951f128900f4691e4c55c6267f003e59aa229c", "94e9e8f16a7a72d1491694b44006b96212d8076e" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Thu Dec 05 19:35:35 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:35:35 2013 +0000" }, "message": "am 94e9e8f1: am f5f75cd8: Merge \"Merge commit \\\u002781132d51\\\u0027 into fix-merge-conflict\" into klp-dev\n\n* commit \u002794e9e8f16a7a72d1491694b44006b96212d8076e\u0027:\n" }, { "commit": "cc951f128900f4691e4c55c6267f003e59aa229c", "tree": "d4c7f65d63d17434ea04029bf7be76559e30568b", "parents": [ "027b0651eb136916eebe730441258b7e205b48cf", "1c7799e2f35b707c5f5d6544a6d94cd4892891da" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Thu Dec 05 19:35:27 2013 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 05 19:35:27 2013 +0000" }, "message": "am 1c7799e2: am 09335703: Merge \"Use new ISurfaceComposer::destroyDisplay method\" into klp-dev\n\n* commit \u00271c7799e2f35b707c5f5d6544a6d94cd4892891da\u0027:\n" } ], "next": "027b0651eb136916eebe730441258b7e205b48cf" }