)]}' { "log": [ { "commit": "ac3e2159b41b825874cf574cf59225d4fbddfbcb", "tree": "85f0f5a27a4cc75f19ec18cf95ca61f22267db31", "parents": [ "0d829149292713f05b85f33fedaba88771627533", "1b9e2bec6381ac7e7d0cfe0db549c5396d2ba7ce" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 21:31:49 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 21:31:49 2009 -0800" }, "message": "Merge change Icaf78440 into eclair-mr2\n\n* changes:\n Split vCard composer into two parts: VCardComposer and VCardBuilder.\n" }, { "commit": "1b9e2bec6381ac7e7d0cfe0db549c5396d2ba7ce", "tree": "0eb49f4a4bb5e9cf8dca9d529f139a0791e6db4e", "parents": [ "f016fa632b1d3c606934bc11a889af3921c6120e" ], "author": { "name": "Daisuke Miyakawa", "email": "dmiyakawa@google.com", "time": "Tue Nov 17 11:40:45 2009 +0900" }, "committer": { "name": "Daisuke Miyakawa", "email": "dmiyakawa@google.com", "time": "Tue Nov 17 14:30:17 2009 +0900" }, "message": "Split vCard composer into two parts: VCardComposer and VCardBuilder.\n\nAs for VCardBuilder, there was a class with the same name, but this implementation is fundamentally different.\nThis time, VCardBuilder is like StringBuilder. It enables developers to create their own vCard by themselves.\n\nMake Constants public and rename it to VCardConstants.\n\nInternal issue number: 2242528, 2195990\n" }, { "commit": "0d829149292713f05b85f33fedaba88771627533", "tree": "8b1173720fb0e224c79f959f7bb063898f085dcd", "parents": [ "4b26bab8a455050b3d337725ab30ac2da0379cbe", "f8c4af65e8f9c7f395ac8eb52fe741242f6747b6" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Nov 16 19:56:49 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 19:56:49 2009 -0800" }, "message": "am f8c4af65: Merge change I51b84496 into eclair\n\nMerge commit \u0027f8c4af65e8f9c7f395ac8eb52fe741242f6747b6\u0027 into eclair-mr2\n\n* commit \u0027f8c4af65e8f9c7f395ac8eb52fe741242f6747b6\u0027:\n Revert \"PowerManagerService: enable logging for when mPowerState changes.\"\n" }, { "commit": "4b26bab8a455050b3d337725ab30ac2da0379cbe", "tree": "48539efa99b06d4404e32493f6c9658067efc07e", "parents": [ "fd5cfd885da4ee883153474d43e883aac7516023", "06ddc67797388da6260e43579c7ebd506b5b376c" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Nov 16 19:56:30 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 19:56:30 2009 -0800" }, "message": "am 06ddc677: am 00ecac95: Merge change If556e259 into eclair-sdk\n\nMerge commit \u002706ddc67797388da6260e43579c7ebd506b5b376c\u0027 into eclair-mr2\n\n* commit \u002706ddc67797388da6260e43579c7ebd506b5b376c\u0027:\n docs: remove all content from the older sdk download,\n" }, { "commit": "fd5cfd885da4ee883153474d43e883aac7516023", "tree": "034ded8573e550f162e70938b141e8ba130c66f4", "parents": [ "43e9eb28ab9a246472149384567f505434f492a3", "f36b8f439babc141970b1207d1d9c12b7a14c468" ], "author": { "name": "Mike Cleron", "email": "mcleron@google.com", "time": "Mon Nov 16 19:56:09 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 19:56:09 2009 -0800" }, "message": "am f36b8f43: Merge change Ia428b2c2 into eclair\n\nMerge commit \u0027f36b8f439babc141970b1207d1d9c12b7a14c468\u0027 into eclair-mr2\n\n* commit \u0027f36b8f439babc141970b1207d1d9c12b7a14c468\u0027:\n This time for sure: make wallpapers work\n" }, { "commit": "43e9eb28ab9a246472149384567f505434f492a3", "tree": "0f7486da731d9496667af6685d7484a8b5b24b0b", "parents": [ "340733697fcb0b73a707eb544b958af3121cdf60", "9ddb7df88a62a131519264f75f5d6616ee11b6e6" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 16 19:55:53 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 19:55:53 2009 -0800" }, "message": "am 9ddb7df8: Fix build.\n\nMerge commit \u00279ddb7df88a62a131519264f75f5d6616ee11b6e6\u0027 into eclair-mr2\n\n* commit \u00279ddb7df88a62a131519264f75f5d6616ee11b6e6\u0027:\n Fix build.\n" }, { "commit": "340733697fcb0b73a707eb544b958af3121cdf60", "tree": "bd7006191ec8c8817329968fe07b99009c9e5841", "parents": [ "beaf87bfec29378b27bd28c1d1d2c4db1116d7ce", "69e0b6646f109d17a5cff4b8c32582e3d3a3f544" ], "author": { "name": "Adam Bliss", "email": "abliss@google.com", "time": "Mon Nov 16 19:55:31 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 19:55:31 2009 -0800" }, "message": "am 69e0b664: Merge change I000d3564 into eclair\n\nMerge commit \u002769e0b6646f109d17a5cff4b8c32582e3d3a3f544\u0027 into eclair-mr2\n\n* commit \u002769e0b6646f109d17a5cff4b8c32582e3d3a3f544\u0027:\n Move map tiles to no-dpi since they are dpi-independent.\n" }, { "commit": "beaf87bfec29378b27bd28c1d1d2c4db1116d7ce", "tree": "806cff7c9214e50af03bf1211991d494ace5c6fe", "parents": [ "92b1880084ccfbe2ae03eec6a9656c5372c03f12", "60d7db4c3e3d60060e7ac021445ea1f510b7a1fb" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 16 19:55:13 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 19:55:13 2009 -0800" }, "message": "am 60d7db4c: Fix #2262593: 42 ANR reports from android.process.acore\n\nMerge commit \u002760d7db4c3e3d60060e7ac021445ea1f510b7a1fb\u0027 into eclair-mr2\n\n* commit \u002760d7db4c3e3d60060e7ac021445ea1f510b7a1fb\u0027:\n Fix #2262593: 42 ANR reports from android.process.acore\n" }, { "commit": "92b1880084ccfbe2ae03eec6a9656c5372c03f12", "tree": "b4bf4fb021cf3e10ca5cb4673de21b6ef9e39a81", "parents": [ "a822f02bb9c7f5bf2e3fa3cb63effc391be158c5", "ab5efde8dcdfcafea7e9d95350e18022b1adc679" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 16 19:53:15 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 19:53:15 2009 -0800" }, "message": "am ab5efde8: Merge change Iff5b8ce3 into eclair\n\nMerge commit \u0027ab5efde8dcdfcafea7e9d95350e18022b1adc679\u0027 into eclair-mr2\n\n* commit \u0027ab5efde8dcdfcafea7e9d95350e18022b1adc679\u0027:\n Work on issue 2259506: camera ANRed and then device runtime restarted\n" }, { "commit": "a822f02bb9c7f5bf2e3fa3cb63effc391be158c5", "tree": "1e966e8efcebb346e51c027a7d0d4b25e29f178b", "parents": [ "6e045e0aa1b465e9e989d3058a5d2fa13dcf026b", "dc49acb0289cab2a6e0d73e66b69516605893e28" ], "author": { "name": "Jack Palevich", "email": "jackpal@google.com", "time": "Tue Nov 17 11:39:54 2009 +0800" }, "committer": { "name": "Jack Palevich", "email": "jackpal@google.com", "time": "Tue Nov 17 11:39:54 2009 +0800" }, "message": "resolved conflicts for merge of dc49acb0 to eclair-mr2\n" }, { "commit": "f8c4af65e8f9c7f395ac8eb52fe741242f6747b6", "tree": "9aa13697f81204fb74a7dc5ec04489c9c76cd30a", "parents": [ "06ddc67797388da6260e43579c7ebd506b5b376c", "51b844965be75a2f2e4e83efdd887b0635637d19" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 19:04:06 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 19:04:06 2009 -0800" }, "message": "Merge change I51b84496 into eclair\n\n* changes:\n Revert \"PowerManagerService: enable logging for when mPowerState changes.\"\n" }, { "commit": "51b844965be75a2f2e4e83efdd887b0635637d19", "tree": "14d33a92a9cd6255377b4a2d3dbe778503a8678f", "parents": [ "f36b8f439babc141970b1207d1d9c12b7a14c468" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Nov 16 21:51:18 2009 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Nov 16 21:51:18 2009 -0500" }, "message": "Revert \"PowerManagerService: enable logging for when mPowerState changes.\"\n\nThis reverts commit 24ace3395b532e3cbb63d2a6197a91dd9242bb36.\n\nBug b/2265538 (verbose logging from power manager)\n" }, { "commit": "06ddc67797388da6260e43579c7ebd506b5b376c", "tree": "9b97e9bed776a570d48fe1fc8796b2c66aba8932", "parents": [ "f36b8f439babc141970b1207d1d9c12b7a14c468", "00ecac957c4a5d2df132640ff418280d969e7d83" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Nov 16 18:25:56 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 18:25:56 2009 -0800" }, "message": "am 00ecac95: Merge change If556e259 into eclair-sdk\n\nMerge commit \u002700ecac957c4a5d2df132640ff418280d969e7d83\u0027 into eclair\n\n* commit \u002700ecac957c4a5d2df132640ff418280d969e7d83\u0027:\n docs: remove all content from the older sdk download,\n" }, { "commit": "00ecac957c4a5d2df132640ff418280d969e7d83", "tree": "3fac2c9c74c0dc0d3ddaeba57544e04ac2c2bb06", "parents": [ "59450740c72c8642c25e2fa757754dc32252d1a2", "8ef5a6b6aeb27fd5113dbf1d881aab4dc5ccb6bb" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 18:19:10 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 18:19:10 2009 -0800" }, "message": "Merge change If556e259 into eclair-sdk\n\n* changes:\n docs: remove all content from the older sdk download, install, and requirements pages and redirect to the new sdk pages. Also update the \"older sdks\" doc to include all version-specific sdks. also update the robots file to disallow indexing of the old sdk docs.\n" }, { "commit": "f36b8f439babc141970b1207d1d9c12b7a14c468", "tree": "3a0b7306094dee6fbdc8738390d4948637084738", "parents": [ "9ddb7df88a62a131519264f75f5d6616ee11b6e6", "a428b2c260dddd267b541909517cc4f6cf769714" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 18:02:20 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 18:02:20 2009 -0800" }, "message": "Merge change Ia428b2c2 into eclair\n\n* changes:\n This time for sure: make wallpapers work\n" }, { "commit": "9ddb7df88a62a131519264f75f5d6616ee11b6e6", "tree": "1c5d3106848a10cca9c68e164eaec788c2c7c14e", "parents": [ "69e0b6646f109d17a5cff4b8c32582e3d3a3f544" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 16 17:59:32 2009 -0800" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 16 17:59:32 2009 -0800" }, "message": "Fix build.\n\nChange-Id: I70c86738e2894d7f8c51034aea8fda1585a6fcb3\n" }, { "commit": "69e0b6646f109d17a5cff4b8c32582e3d3a3f544", "tree": "6cf0b8760bda9886d845df1b89a599b9cf250791", "parents": [ "60d7db4c3e3d60060e7ac021445ea1f510b7a1fb", "000d356458b880379379643edf261027face1a81" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 17:53:20 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 17:53:20 2009 -0800" }, "message": "Merge change I000d3564 into eclair\n\n* changes:\n Move map tiles to no-dpi since they are dpi-independent.\n" }, { "commit": "000d356458b880379379643edf261027face1a81", "tree": "fdf87a0b4baaf5d5b9c22bc3a74dbd726589b718", "parents": [ "ab5efde8dcdfcafea7e9d95350e18022b1adc679" ], "author": { "name": "Adam Bliss", "email": "abliss@google.com", "time": "Mon Nov 16 17:47:41 2009 -0800" }, "committer": { "name": "Adam Bliss", "email": "abliss@google.com", "time": "Mon Nov 16 17:47:41 2009 -0800" }, "message": "Move map tiles to no-dpi since they are dpi-independent.\n" }, { "commit": "8ef5a6b6aeb27fd5113dbf1d881aab4dc5ccb6bb", "tree": "e41c74e7d36d3ae213c4e3b874f24b86561392ec", "parents": [ "88427cff609e668185010af2244500be5823595e" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri Nov 06 18:38:33 2009 -0800" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Mon Nov 16 17:39:52 2009 -0800" }, "message": "docs: remove all content from the older sdk download,\ninstall, and requirements pages and redirect to the new sdk\npages. Also update the \"older sdks\"\ndoc to include all version-specific sdks.\nalso update the robots file to disallow indexing\nof the old sdk docs.\n" }, { "commit": "60d7db4c3e3d60060e7ac021445ea1f510b7a1fb", "tree": "bfefb081cab416e1a9c4583f4ca1fa345cf60fd8", "parents": [ "ab5efde8dcdfcafea7e9d95350e18022b1adc679" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 16 17:16:26 2009 -0800" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 16 17:16:26 2009 -0800" }, "message": "Fix #2262593: 42 ANR reports from android.process.acore\n\nThere was a lock in AssetManager that purported to be per-instance (mSync)\nbut was actually static. A lot of code used it like it was per-instance,\nbut this would actually block all instances. This is now changed to fix\nthe name and make everything except the actual static data lock on the\nspecific AssetManager instance.\n\nChange-Id: Ie8e9ad60f962184e76b2301f7a2790d0c2487063\n" }, { "commit": "ab5efde8dcdfcafea7e9d95350e18022b1adc679", "tree": "eaf2fa1b6de40be55b6d0866d893877eedc2e6c7", "parents": [ "dc49acb0289cab2a6e0d73e66b69516605893e28", "f670ef72354502c7169934af949af42e45e738bb" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 16:33:41 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 16:33:41 2009 -0800" }, "message": "Merge change Iff5b8ce3 into eclair\n\n* changes:\n Work on issue 2259506: camera ANRed and then device runtime restarted\n" }, { "commit": "dc49acb0289cab2a6e0d73e66b69516605893e28", "tree": "167bebb6df9ff8aa93cbf622d3775b5e65b233fe", "parents": [ "e0cadd7cd811a674df62279dec00d17678b2c501", "a08d46d8aaabb53eef4d5dc47272565d50f23c19" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 15:48:47 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 15:48:47 2009 -0800" }, "message": "Merge change Ica8c305a into eclair\n\n* changes:\n More GLSurfaceView cleanup.\n" }, { "commit": "6e045e0aa1b465e9e989d3058a5d2fa13dcf026b", "tree": "555ec16a12b43ea7027cf0f22226221c1fe133e9", "parents": [ "fc36afcba6e65f2e0816b1af08255b9ccafb17a6", "e0cadd7cd811a674df62279dec00d17678b2c501" ], "author": { "name": "Jack Wang", "email": "jackwang@google.com", "time": "Mon Nov 16 15:25:06 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 15:25:06 2009 -0800" }, "message": "am e0cadd7c: Merge change Iffbb6e55 into eclair\n\nMerge commit \u0027e0cadd7cd811a674df62279dec00d17678b2c501\u0027 into eclair-mr2\n\n* commit \u0027e0cadd7cd811a674df62279dec00d17678b2c501\u0027:\n Make perf metrics collection \u0026 output via instrumentation simpler\n" }, { "commit": "e0cadd7cd811a674df62279dec00d17678b2c501", "tree": "1c7335b341cf4da388741451637e4bff3bc2bffd", "parents": [ "f998c4a289b3ed10bafcf581618d2cc8a8f69806", "4f414bd7a76fc7ff063db70d1cdd09303c28cbe5" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 15:20:46 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 15:20:46 2009 -0800" }, "message": "Merge change Iffbb6e55 into eclair\n\n* changes:\n Make perf metrics collection \u0026 output via instrumentation simpler\n" }, { "commit": "fc36afcba6e65f2e0816b1af08255b9ccafb17a6", "tree": "53b948220548ebbb6addc130d8344ce2a409ef7b", "parents": [ "8059bcbfa71c8233e616304843d9280f5f1615bb", "f998c4a289b3ed10bafcf581618d2cc8a8f69806" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Nov 16 15:08:11 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 15:08:11 2009 -0800" }, "message": "am f998c4a2: Merge change I1c0bebbc into eclair\n\nMerge commit \u0027f998c4a289b3ed10bafcf581618d2cc8a8f69806\u0027 into eclair-mr2\n\n* commit \u0027f998c4a289b3ed10bafcf581618d2cc8a8f69806\u0027:\n fix [2262591] Junk on screen in ERD46\n" }, { "commit": "f998c4a289b3ed10bafcf581618d2cc8a8f69806", "tree": "3686ad4e70be87dc15955db2b768bb838d77785c", "parents": [ "1162fd77a8ff8467c96204c00bcaf941aef6aa85", "1c0bebbc9548dfe929f0f9db4473eb93af9339f5" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 15:05:16 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 15:05:16 2009 -0800" }, "message": "Merge change I1c0bebbc into eclair\n\n* changes:\n fix [2262591] Junk on screen in ERD46\n" }, { "commit": "1c0bebbc9548dfe929f0f9db4473eb93af9339f5", "tree": "6a42ca05daf36ae91814f50c20ac6f101ca23a59", "parents": [ "19e420c52dbe42e5b4b8b3580a5e7908cebec89d" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Nov 16 14:55:36 2009 -0800" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Nov 16 14:55:36 2009 -0800" }, "message": "fix [2262591] Junk on screen in ERD46\n\nsince we\u0027re using the GPU for composition, don\u0027t use a texture for dimming,\ninstead simply use an alpha-blended quad.\n\nalso workaround what looks like a GL driver bug by calling glFinish() before\nglReadPixels().\n" }, { "commit": "8059bcbfa71c8233e616304843d9280f5f1615bb", "tree": "945545ee86c1c9dbed0c8942279de87c8fb74593", "parents": [ "22186a2c15cc752cfaaf8a12d415a3c097d338e0", "1162fd77a8ff8467c96204c00bcaf941aef6aa85" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Nov 16 14:49:07 2009 -0800" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Nov 16 14:49:07 2009 -0800" }, "message": "resolved conflicts for merge of 1162fd77 to eclair-mr2\n" }, { "commit": "1162fd77a8ff8467c96204c00bcaf941aef6aa85", "tree": "49aaf5420a1817823f70ac83ba238f22a2793236", "parents": [ "ec8178eb0fb10e1ed753be4d065cf7f004355575" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Wed Nov 04 17:58:08 2009 -0800" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon Nov 16 14:27:19 2009 -0800" }, "message": "Let RemoteViews nest children, allow ViewFlipper.\n\nThis change allows applications to nest children RemoteViews\ninside an existing set of RemoteViews. These nested views\nare inflated and treated as addView() calls.\n\nThis change also allows ViewFlipper through RemoteViews, and\nadds logic surpress flipping when the parent window is\ndetached or behind the lockscreen. Also fixes ViewAnimator\nto observe the measureAllChildren flag when set.\n\nFixes http://b/2239905\n" }, { "commit": "22186a2c15cc752cfaaf8a12d415a3c097d338e0", "tree": "f689d2c1f614888fd214726836648825ce4baad6", "parents": [ "f016fa632b1d3c606934bc11a889af3921c6120e", "ec8178eb0fb10e1ed753be4d065cf7f004355575" ], "author": { "name": "Jason Sams", "email": "rjsams@android.com", "time": "Mon Nov 16 14:04:15 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 14:04:15 2009 -0800" }, "message": "am ec8178eb: Merge change I9c1bad53 into eclair\n\nMerge commit \u0027ec8178eb0fb10e1ed753be4d065cf7f004355575\u0027 into eclair-mr2\n\n* commit \u0027ec8178eb0fb10e1ed753be4d065cf7f004355575\u0027:\n Add setPriority to allow wallpapers to run at lower cpu priority than default.\n" }, { "commit": "ec8178eb0fb10e1ed753be4d065cf7f004355575", "tree": "0c29fb47ba2166f5865fb52ab85c6f3be90ba730", "parents": [ "19e420c52dbe42e5b4b8b3580a5e7908cebec89d", "7d787b4722eaeb79cab42c36060336e092b77b5f" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 14:01:30 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 14:01:30 2009 -0800" }, "message": "Merge change I9c1bad53 into eclair\n\n* changes:\n Add setPriority to allow wallpapers to run at lower cpu priority than default.\n" }, { "commit": "f670ef72354502c7169934af949af42e45e738bb", "tree": "23e6329ba09be3c16fafddfaec1dc2371d29e5e5", "parents": [ "19e420c52dbe42e5b4b8b3580a5e7908cebec89d" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 16 13:59:16 2009 -0800" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Nov 16 13:59:16 2009 -0800" }, "message": "Work on issue 2259506: camera ANRed and then device runtime restarted\n\nIf a process fails to come up, we could leave content providers and\nservices hanging around.\n\nChange-Id: Iff5b8ce3b933580954724338a89e110e45f1b00c\n" }, { "commit": "f016fa632b1d3c606934bc11a889af3921c6120e", "tree": "ff174381fea67ec6ef868132f71668be651f1f49", "parents": [ "1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b", "3d745c2b925ccc7c6591dbb3dfd21649782af991" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 13:19:08 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 13:19:08 2009 -0800" }, "message": "Merge change Ib1f7c3cb into eclair-mr2\n\n* changes:\n Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.\n" }, { "commit": "3d745c2b925ccc7c6591dbb3dfd21649782af991", "tree": "86e8abc02051362768544acb32cb343e08ccbce7", "parents": [ "9e807d7cc4e5deafc0744abd932e2b40e3f5e80b" ], "author": { "name": "Daisuke Miyakawa", "email": "dmiyakawa@google.com", "time": "Mon Nov 16 17:11:25 2009 +0900" }, "committer": { "name": "Daisuke Miyakawa", "email": "dmiyakawa@google.com", "time": "Tue Nov 17 06:16:22 2009 +0900" }, "message": "Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.\n\nInternal issue number: 2195990\n" }, { "commit": "1ddc0077ac0c26a9dc74875791bfea3f34a8cc7b", "tree": "6093c370379123b0e5591079e083f3259e1c9085", "parents": [ "a57632fee792d6078a7a61006f5a866c38addd33", "19e420c52dbe42e5b4b8b3580a5e7908cebec89d" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon Nov 16 11:32:53 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 11:32:53 2009 -0800" }, "message": "am 19e420c5: Merge change Iae493184 into eclair\n\nMerge commit \u002719e420c52dbe42e5b4b8b3580a5e7908cebec89d\u0027 into eclair-mr2\n\n* commit \u002719e420c52dbe42e5b4b8b3580a5e7908cebec89d\u0027:\n Minor fix for the parent style computation in the layoutlib.\n" }, { "commit": "19e420c52dbe42e5b4b8b3580a5e7908cebec89d", "tree": "3b7c170e23c7010e32217b92701abd7463f4a691", "parents": [ "fa82d97dc67b2c3047ad2abe7553d4a0f47b6e7f", "0da2676ea841ff85b373c2960dd2c497dcf4e441" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 11:21:34 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 11:21:34 2009 -0800" }, "message": "Merge change Iae493184 into eclair\n\n* changes:\n Minor fix for the parent style computation in the layoutlib.\n" }, { "commit": "a57632fee792d6078a7a61006f5a866c38addd33", "tree": "48f3dfbe97d7ab8bc325eaca86e96b27031c08f1", "parents": [ "5fd01f7aff5bf3e835ce233b68199db19ac93c1d" ], "author": { "name": "Leon Scroggins", "email": "scroggo@google.com", "time": "Mon Nov 16 10:51:12 2009 -0500" }, "committer": { "name": "Leon Scroggins", "email": "scroggo@google.com", "time": "Mon Nov 16 11:47:12 2009 -0500" }, "message": "Fix bugs around removing and attaching WebViews.\n\nWhen removing a WebView from its Window, remove the WebTextView.\nRemove the old attempt to do the same, which was not being called.\n\nWhen attaching a WebView to a Window, call onWindowFocusChanged so\nits state of drawing the selection ring returns.\n\nFixes http://b/issue?id\u003d2257787 and http://b/issue?id\u003d2260867\n" }, { "commit": "5fd01f7aff5bf3e835ce233b68199db19ac93c1d", "tree": "1fe7aa9af2aaf44c394b4544ea9a563530d0d0bc", "parents": [ "f9bf75d59acd8efb45d7137df507241483b1ad34", "fa82d97dc67b2c3047ad2abe7553d4a0f47b6e7f" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon Nov 16 03:24:35 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 03:24:35 2009 -0800" }, "message": "am fa82d97d: Merge change Ib1fb3fcf into eclair\n\nMerge commit \u0027fa82d97dc67b2c3047ad2abe7553d4a0f47b6e7f\u0027 into eclair-mr2\n\n* commit \u0027fa82d97dc67b2c3047ad2abe7553d4a0f47b6e7f\u0027:\n Keep screen bright until boot completed.\n" }, { "commit": "fa82d97dc67b2c3047ad2abe7553d4a0f47b6e7f", "tree": "81a4b732cb9c7a18feaaf70239a719c1be57ce65", "parents": [ "e2071c6b1d68220976d495d917566edf01303680", "2d7bb81ac4c04447a1e04fef82986b939823dea4" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 03:21:12 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 03:21:12 2009 -0800" }, "message": "Merge change Ib1fb3fcf into eclair\n\n* changes:\n Keep screen bright until boot completed.\n" }, { "commit": "a08d46d8aaabb53eef4d5dc47272565d50f23c19", "tree": "f2f1bb9ca023c1b40241472d40347e0cee3eecb6", "parents": [ "7c1c46000be136ffda36283fdc93bfe3cba72601" ], "author": { "name": "Jack Palevich", "email": "jackpal@google.com", "time": "Mon Nov 16 18:48:26 2009 +0800" }, "committer": { "name": "Jack Palevich", "email": "jackpal@google.com", "time": "Mon Nov 16 18:48:26 2009 +0800" }, "message": "More GLSurfaceView cleanup.\n\n+ The mDone flag is now a pair of flags: mShouldExit and mExited. The\nproblem with mDone was that it meant \"had been asked to exit\", but was\nbeing used by some observers as \"had exited\". Using two variables means\nthat observers can observe either \"had been asked to exit\" or \"had exited\",\nas they prefer.\n\n+ Simplyify where we check for mShouldExit. We now check for it at the\n top of our innermost guardedRun while loop.\n\n+ requestExitAndWait now waits for mExited to be set to true to know\nthat a thread has exited, rather than using join(). This means we can use\nwait() for the check, which releases the sGLThreadManager\nmonitor, avoiding a potential deadlock.\n\n+ move the event queue into the sGLThreadManager monitor. This avoids\nhaving to acquire two locks in order to enque/deque events, which also\navoids the potential for lock ordering deadlocks.\n\n+ Simplify the event dequeueing code. We now deque one event each time\nthrough the main GLSurfaceView loop. Events still have priority over\nrendering, so there isn\u0027t any semantic change, it just cleans up the code.\n\n+ Avoid trying to acquire an egl Surface if we\u0027re paused.\n\n+ To simplify reasoning about the code, call sGLThreadManager.notifyAll()\nin every case where we modify one of the variables that\u0027s protected by\nthe sGLThreadManager monitor. It would be slightly more efficient to only\nnotify when we change variables that could cause a thread to wait(), but\nthen we would have to redo our analysis every time we change any code.\n\n+ Clean up the logic for creating the EGL surface and then calling the\nrenderer\u0027s onSurfaceCreated / onSurfaceChanged methods.\n\n+ Implement work-around for bug 2263168\t\"Need to draw twice after\n screen rotation...\"\n" }, { "commit": "f9bf75d59acd8efb45d7137df507241483b1ad34", "tree": "8cc30447299d2bc0ad441e3921b706fedaf0ece5", "parents": [ "9e807d7cc4e5deafc0744abd932e2b40e3f5e80b", "e2071c6b1d68220976d495d917566edf01303680" ], "author": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Mon Nov 16 00:34:38 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 16 00:34:38 2009 -0800" }, "message": "am e2071c6b: Merge change I326e3e29 into eclair\n\nMerge commit \u0027e2071c6b1d68220976d495d917566edf01303680\u0027 into eclair-mr2\n\n* commit \u0027e2071c6b1d68220976d495d917566edf01303680\u0027:\n dumpstate: include the contents of the last radio log\n" }, { "commit": "e2071c6b1d68220976d495d917566edf01303680", "tree": "f69208caa8edf4365a2601fd929c29c434e1936d", "parents": [ "be9060b5d944a2b9ac5a0bdc018b4741dc2cd531", "326e3e291a01b31df12fd33dd2f814a1ac61e2fe" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 00:30:10 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 16 00:30:10 2009 -0800" }, "message": "Merge change I326e3e29 into eclair\n\n* changes:\n dumpstate: include the contents of the last radio log\n" }, { "commit": "9e807d7cc4e5deafc0744abd932e2b40e3f5e80b", "tree": "7b2a190d3b6619bbf60f645e3a2ca9a625d1a89d", "parents": [ "92c12fae9a977ea1dcb9f4de56257d4945101db7", "5a1f2d2de026b582fbe8b1a46a83ad33760a2c48" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Nov 15 23:51:34 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Nov 15 23:51:34 2009 -0800" }, "message": "Merge change Iecf85b40 into eclair-mr2\n\n* changes:\n Rename several files so that readers would not be confused.\n" }, { "commit": "5a1f2d2de026b582fbe8b1a46a83ad33760a2c48", "tree": "306171225691aed3c9cac73be19ffd9af49c3249", "parents": [ "e3cfe2d92868513c9524804a362c3c3c8b8cc4e5" ], "author": { "name": "Daisuke Miyakawa", "email": "dmiyakawa@google.com", "time": "Mon Nov 16 15:58:32 2009 +0900" }, "committer": { "name": "Daisuke Miyakawa", "email": "dmiyakawa@google.com", "time": "Mon Nov 16 16:31:32 2009 +0900" }, "message": "Rename several files so that readers would not be confused.\n\nAdd unit tests around Phone-number handling and fix some bugs.\n\nInternal issue number: 2195990\n" }, { "commit": "a428b2c260dddd267b541909517cc4f6cf769714", "tree": "b670fc527458fe648357a9a52d4d166b87af627f", "parents": [ "7c1c46000be136ffda36283fdc93bfe3cba72601" ], "author": { "name": "Mike Cleron", "email": "mcleron@google.com", "time": "Sun Nov 15 22:53:08 2009 -0800" }, "committer": { "name": "Mike Cleron", "email": "mcleron@google.com", "time": "Sun Nov 15 22:53:08 2009 -0800" }, "message": "This time for sure: make wallpapers work\n\nFix http://b/issue?id\u003d2262556. Make restoring\nwork as well as switching between live and \nnon-live wallpapers. Also support live wallpaper\nas default. " }, { "commit": "92c12fae9a977ea1dcb9f4de56257d4945101db7", "tree": "2af4feb213b0ad12108c2406d640399cf79b465d", "parents": [ "8faa61c3304392a9ab02387b1adad49dc8a5e488" ], "author": { "name": "Dan Egnor", "email": "egnor@google.com", "time": "Sun Nov 15 20:49:39 2009 -0800" }, "committer": { "name": "Dan Egnor", "email": "egnor@google.com", "time": "Sun Nov 15 20:53:01 2009 -0800" }, "message": "Fix Zygote -- don\u0027t depend on these classes that are no longer\nin the bootclasspath. (This is a quick edit to the generated\nfile; the next time the file is properly regenerated, it won\u0027t\ninclude these files.)\n" }, { "commit": "8faa61c3304392a9ab02387b1adad49dc8a5e488", "tree": "17fbbf1d903549e23a8d233fd8bcd560b65eda74", "parents": [ "607b9c37de459d57b7c2f8333e743bba0d159c7c", "be9060b5d944a2b9ac5a0bdc018b4741dc2cd531" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sun Nov 15 19:22:01 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Nov 15 19:22:01 2009 -0800" }, "message": "am be9060b5: am 59450740: Merge change I0b0a4d6a into eclair-sdk\n\nMerge commit \u0027be9060b5d944a2b9ac5a0bdc018b4741dc2cd531\u0027 into eclair-mr2\n\n* commit \u0027be9060b5d944a2b9ac5a0bdc018b4741dc2cd531\u0027:\n docs: update the publishing guide to revise the updating section\n" }, { "commit": "be9060b5d944a2b9ac5a0bdc018b4741dc2cd531", "tree": "bd9cd7814d4ae30bd470316c0b05eacce059290e", "parents": [ "521d400b230bee5e7b9748f26832c0d0275b8253", "59450740c72c8642c25e2fa757754dc32252d1a2" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Sun Nov 15 19:18:45 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Nov 15 19:18:45 2009 -0800" }, "message": "am 59450740: Merge change I0b0a4d6a into eclair-sdk\n\nMerge commit \u002759450740c72c8642c25e2fa757754dc32252d1a2\u0027 into eclair\n\n* commit \u002759450740c72c8642c25e2fa757754dc32252d1a2\u0027:\n docs: update the publishing guide to revise the updating section\n" }, { "commit": "59450740c72c8642c25e2fa757754dc32252d1a2", "tree": "00b2f48a7c38c354b981a6c68b07f2bd3975453d", "parents": [ "dbc7e27ef10349f11ac940d59ff4f812319fce51", "bbfc44acab4491ff1807db6810eb61a93dc0616e" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Nov 15 19:12:13 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Nov 15 19:12:13 2009 -0800" }, "message": "Merge change I0b0a4d6a into eclair-sdk\n\n* changes:\n docs: update the publishing guide to revise the updating section bug 1755357\n" }, { "commit": "326e3e291a01b31df12fd33dd2f814a1ac61e2fe", "tree": "172a82a71372bbf65e337ae7ee060a430b7c1b2e", "parents": [ "521d400b230bee5e7b9748f26832c0d0275b8253" ], "author": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Sun Nov 15 18:28:06 2009 -0800" }, "committer": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Sun Nov 15 18:28:41 2009 -0800" }, "message": "dumpstate: include the contents of the last radio log\n\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n" }, { "commit": "607b9c37de459d57b7c2f8333e743bba0d159c7c", "tree": "317eebc4ccf7f90f27768c416c51311261ce1b20", "parents": [ "ac4bacd9777c12e4cd6ddc335518a61a3f18f47f", "521d400b230bee5e7b9748f26832c0d0275b8253" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sun Nov 15 17:17:13 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Nov 15 17:17:13 2009 -0800" }, "message": "am 521d400b: Fix 2209086: Add animations and misc ui improvements to SlidingTab.\n\nMerge commit \u0027521d400b230bee5e7b9748f26832c0d0275b8253\u0027 into eclair-mr2\n\n* commit \u0027521d400b230bee5e7b9748f26832c0d0275b8253\u0027:\n Fix 2209086: Add animations and misc ui improvements to SlidingTab.\n" }, { "commit": "521d400b230bee5e7b9748f26832c0d0275b8253", "tree": "09ac88594270014e41a135ba987a41cfe16b1586", "parents": [ "16a9d9a736a1bfdc12aa54c549508dd12596247f" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sun Nov 15 16:19:24 2009 -0800" }, "committer": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sun Nov 15 17:06:49 2009 -0800" }, "message": "Fix 2209086: Add animations and misc ui improvements to SlidingTab.\n\nAdded translation animation where tab \"flies\" when you release.\nAdded translation animation where pressing and releasing one tab will hide/show the other\nAdded alpha animation to make target appear gradually\nAdded margin around swipe area to allow easier unlocking.\nRemoved unused handler.\n" }, { "commit": "0da2676ea841ff85b373c2960dd2c497dcf4e441", "tree": "0837d28b366841085dcaba8074ef8f79dc47ccf3", "parents": [ "ae2104371d84570011dbb8c1621832a132ed4584" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Sun Nov 15 16:13:01 2009 -0800" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Sun Nov 15 16:15:33 2009 -0800" }, "message": "Minor fix for the parent style computation in the layoutlib.\n\nThis is an SDK change only.\n\nChange-Id: Iae493184ae76b2e21200dd6bb48795ff74f79ab3\n" }, { "commit": "2d7bb81ac4c04447a1e04fef82986b939823dea4", "tree": "ab4bf44d1123186785b5379941f973c147f3ab41", "parents": [ "04c585e3bcb75c85ceeacf2fd94ea4194f332404" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Sun Nov 15 18:12:22 2009 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Sun Nov 15 18:12:22 2009 -0500" }, "message": "Keep screen bright until boot completed.\n\nFixes b/2262575 (device boots into darkness)\n\nChange-Id: Ib1fb3fcfd4a389d8aa5803a60e07660cfbe4fe47\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "ac4bacd9777c12e4cd6ddc335518a61a3f18f47f", "tree": "bdf080f9726c8e97387f08bff11b3c0dd4aa17d9", "parents": [ "197ef85ef5c8563270a38808d2716a29e12e00e9", "16a9d9a736a1bfdc12aa54c549508dd12596247f" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sun Nov 15 14:51:12 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Nov 15 14:51:12 2009 -0800" }, "message": "am 16a9d9a7: Fix 2209086: Fix missing callback that was preventing tab bar text from updating.\n\nMerge commit \u002716a9d9a736a1bfdc12aa54c549508dd12596247f\u0027 into eclair-mr2\n\n* commit \u002716a9d9a736a1bfdc12aa54c549508dd12596247f\u0027:\n Fix 2209086: Fix missing callback that was preventing tab bar text from updating.\n" }, { "commit": "197ef85ef5c8563270a38808d2716a29e12e00e9", "tree": "441c7310e296be3b03e51cadead97d109ab73660", "parents": [ "7f9fb0c4de7b9c8e9e33260d64844aad8a075609", "e5608f5ea55fadb4c99664207865b1220ad0f73b" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sun Nov 15 14:50:19 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Nov 15 14:50:19 2009 -0800" }, "message": "am e5608f5e: Merge change Ied958262 into eclair\n\nMerge commit \u0027e5608f5ea55fadb4c99664207865b1220ad0f73b\u0027 into eclair-mr2\n\n* commit \u0027e5608f5ea55fadb4c99664207865b1220ad0f73b\u0027:\n Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.\n" }, { "commit": "7f9fb0c4de7b9c8e9e33260d64844aad8a075609", "tree": "7beafcb3f655e40f9287ae870c88d5655665cdbf", "parents": [ "fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2", "04c585e3bcb75c85ceeacf2fd94ea4194f332404" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Sun Nov 15 14:49:40 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Nov 15 14:49:40 2009 -0800" }, "message": "am 04c585e3: Merge changes Ia4825f54,If6f80560 into eclair\n\nMerge commit \u002704c585e3bcb75c85ceeacf2fd94ea4194f332404\u0027 into eclair-mr2\n\n* commit \u002704c585e3bcb75c85ceeacf2fd94ea4194f332404\u0027:\n Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.\n PowerManagerService: Hold a wakelock while mProximityTask is queued\n" }, { "commit": "fef18bfcb02aa3ffb6ffb0cc13b9dace52de6bd2", "tree": "605ac452a52aa3fed0396e76be5c6a046384c0e9", "parents": [ "e3cfe2d92868513c9524804a362c3c3c8b8cc4e5", "383aa124de2a830be83a4c90bdd8a3f3e03f05ae" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Sun Nov 15 14:39:53 2009 -0800" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Sun Nov 15 14:39:53 2009 -0800" }, "message": "resolved conflicts for merge of 383aa124 to eclair-mr2\n" }, { "commit": "16a9d9a736a1bfdc12aa54c549508dd12596247f", "tree": "f82029bfe78ac7169efd7a334fd144c8ab40f357", "parents": [ "e5608f5ea55fadb4c99664207865b1220ad0f73b" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sat Nov 14 02:25:27 2009 -0800" }, "committer": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sun Nov 15 13:26:37 2009 -0800" }, "message": "Fix 2209086: Fix missing callback that was preventing tab bar text from updating.\n\nAlso includes a cosmetic fix to move the Digital clock down a bit.\n" }, { "commit": "7d787b4722eaeb79cab42c36060336e092b77b5f", "tree": "4473dfb24df1040538d3ea222649a5ec5d4fd1d0", "parents": [ "04c585e3bcb75c85ceeacf2fd94ea4194f332404" ], "author": { "name": "Jason Sams", "email": "rjsams@android.com", "time": "Sun Nov 15 12:14:26 2009 -0800" }, "committer": { "name": "Jason Sams", "email": "rjsams@android.com", "time": "Sun Nov 15 12:14:26 2009 -0800" }, "message": "Add setPriority to allow wallpapers to run at lower cpu priority than default.\n" }, { "commit": "e5608f5ea55fadb4c99664207865b1220ad0f73b", "tree": "602881f1ec589d0b55a72c99fc34b365504909f8", "parents": [ "04c585e3bcb75c85ceeacf2fd94ea4194f332404", "ec05ece3ba233abedbdf75debbdff9377b8ecf11" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Nov 15 11:41:43 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Nov 15 11:41:43 2009 -0800" }, "message": "Merge change Ied958262 into eclair\n\n* changes:\n Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.\n" }, { "commit": "ec05ece3ba233abedbdf75debbdff9377b8ecf11", "tree": "ea98623a16621e66fef12054a9b70f4944fcc93f", "parents": [ "7c1c46000be136ffda36283fdc93bfe3cba72601" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sun Nov 15 11:04:41 2009 -0800" }, "committer": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sun Nov 15 11:12:39 2009 -0800" }, "message": "Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.\n" }, { "commit": "04c585e3bcb75c85ceeacf2fd94ea4194f332404", "tree": "f272e5a65d272ad221a6458aa85c64d1d70c2a72", "parents": [ "383aa124de2a830be83a4c90bdd8a3f3e03f05ae", "e090281428cbd1114f4ae2f10755013cea09cdb5" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Nov 15 05:32:03 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Nov 15 05:32:03 2009 -0800" }, "message": "Merge changes Ia4825f54,If6f80560 into eclair\n\n* changes:\n Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.\n PowerManagerService: Hold a wakelock while mProximityTask is queued\n" }, { "commit": "383aa124de2a830be83a4c90bdd8a3f3e03f05ae", "tree": "04cd3c8a6fdac066eb163b9ee4d9e7aec9d2f3f5", "parents": [ "7c1c46000be136ffda36283fdc93bfe3cba72601", "60ff11dc393931c10845568bf43b6674dde04a82" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Nov 14 22:12:31 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Nov 14 22:12:31 2009 -0800" }, "message": "Merge change I60ff11dc into eclair\n\n* changes:\n fix an npe when a user tries to get an auth token from an authenticator that doesn\u0027t support it, like exchange\n" }, { "commit": "e090281428cbd1114f4ae2f10755013cea09cdb5", "tree": "0160a95a706b4a23b881a361520b96533f4037d5", "parents": [ "0e5bb7f1c9558bcf76af4f31dd5a11e78bcbdc9d" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Sat Nov 14 21:02:56 2009 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Sat Nov 14 23:12:25 2009 -0500" }, "message": "Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.\n\nDo not cancel screen brightness animation in forceUserActivityLocked unless screen is turning off.\nAlso not turn the screen on if PowerManager.preventScreenOn(false) is called while proximity sensor is active.\n\nFixes b/2254818 (dim display) where due to a race condition the screen is stuck in a dim state.\n\nChange-Id: If6f805609c8d463631b9e22805e5242714ce34c0\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "e3cfe2d92868513c9524804a362c3c3c8b8cc4e5", "tree": "605ac452a52aa3fed0396e76be5c6a046384c0e9", "parents": [ "30dc8d1eeb318ea374a5f03fa91ea5089c3dc8ea" ], "author": { "name": "Dan Egnor", "email": "egnor@google.com", "time": "Sat Nov 14 16:20:04 2009 -0800" }, "committer": { "name": "Dan Egnor", "email": "egnor@google.com", "time": "Sat Nov 14 16:32:13 2009 -0800" }, "message": "Fix the SDK build.\n" }, { "commit": "30dc8d1eeb318ea374a5f03fa91ea5089c3dc8ea", "tree": "8688d5ac2b34da0e4256e5f6ce3a0efded2865f2", "parents": [ "d1841144e4d592724001018f427806edb9c72ae0", "613438086cb68a4e0f48ddd51238f3d9a054ac9d" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Nov 14 16:28:45 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Nov 14 16:28:45 2009 -0800" }, "message": "Merge change I61343808 into eclair-mr2\n\n* changes:\n Remove external/protobuf from the build, now that it\u0027s been moved to vendor/google/libraries.\n" }, { "commit": "0e5bb7f1c9558bcf76af4f31dd5a11e78bcbdc9d", "tree": "e10f0613395a878b58d3f23b1fb080816177078a", "parents": [ "d12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Sat Nov 14 06:36:31 2009 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Sat Nov 14 06:41:20 2009 -0500" }, "message": "PowerManagerService: Hold a wakelock while mProximityTask is queued\n\nThis prevents the device from sleeping while a deferred proximity sensor\nevent is pending.\nFixes b/2260005 (Proximity sensor can fail due to missing wakelock)\n\nChange-Id: Ia4825f548b5b7d8a0b184f720b32c2f21b77b96e\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "d1841144e4d592724001018f427806edb9c72ae0", "tree": "2c94c5b4174e303dd245606980d3e4bd4475ad1d", "parents": [ "cc96ede29a0844b2bdc5174e8bc5d156b589bd4f", "7c1c46000be136ffda36283fdc93bfe3cba72601" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sat Nov 14 02:43:32 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Nov 14 02:43:32 2009 -0800" }, "message": "am 7c1c4600: Merge change I425ca595 into eclair\n\nMerge commit \u00277c1c46000be136ffda36283fdc93bfe3cba72601\u0027 into eclair-mr2\n\n* commit \u00277c1c46000be136ffda36283fdc93bfe3cba72601\u0027:\n Fix 2261626: Don\u0027t show text on button if orientation is vertical.\n" }, { "commit": "7c1c46000be136ffda36283fdc93bfe3cba72601", "tree": "e778d2b0252c3ee92fdb43ccb0e2d04f81710b5d", "parents": [ "20aec2ddee1b82fa59cc4537d6b42b6897bc30ca", "425ca595dcc37ddb7a9f96310e5b800f424811a6" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Nov 14 02:39:51 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Nov 14 02:39:51 2009 -0800" }, "message": "Merge change I425ca595 into eclair\n\n* changes:\n Fix 2261626: Don\u0027t show text on button if orientation is vertical.\n" }, { "commit": "cc96ede29a0844b2bdc5174e8bc5d156b589bd4f", "tree": "c118abc7f5371256f7b5c83d928d200ebd9d639a", "parents": [ "aca29235a75bde8baf121b7e54b058d29f286003", "20aec2ddee1b82fa59cc4537d6b42b6897bc30ca" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Sat Nov 14 01:06:14 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Nov 14 01:06:14 2009 -0800" }, "message": "am 20aec2dd: Merge change I830df4b1 into eclair\n\nMerge commit \u002720aec2ddee1b82fa59cc4537d6b42b6897bc30ca\u0027 into eclair-mr2\n\n* commit \u002720aec2ddee1b82fa59cc4537d6b42b6897bc30ca\u0027:\n addresses several bugs: 2206097, 2166583, 2261119, 2216759\n" }, { "commit": "20aec2ddee1b82fa59cc4537d6b42b6897bc30ca", "tree": "0d312543d31e027044e64d7294e4b6f6ab84c4b8", "parents": [ "d12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9", "830df4b16971527b07a829cf80a0c9e07a89b89a" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Nov 14 01:01:26 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Nov 14 01:01:26 2009 -0800" }, "message": "Merge change I830df4b1 into eclair\n\n* changes:\n addresses several bugs: 2206097, 2166583, 2261119, 2216759\n" }, { "commit": "425ca595dcc37ddb7a9f96310e5b800f424811a6", "tree": "e9d05c9dd7ff9f8a874123e383b0eb99524d8d55", "parents": [ "fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri Nov 13 19:20:28 2009 -0800" }, "committer": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Fri Nov 13 19:20:28 2009 -0800" }, "message": "Fix 2261626: Don\u0027t show text on button if orientation is vertical.\n" }, { "commit": "830df4b16971527b07a829cf80a0c9e07a89b89a", "tree": "895d0c7a9734a5da6da54e8882e5c3462192c229", "parents": [ "91e40e7838d183cb2a9e750edf0a6572f21da21d" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri Nov 13 18:54:14 2009 -0800" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri Nov 13 18:54:14 2009 -0800" }, "message": "addresses several bugs: 2206097, 2166583, 2261119, 2216759\n\n2206097: Broken suggestions while composing message\n2166583: Color artifacts with MDP dithering\n2261119: Passion transition animations are rough\n2216759: Screen flicker when dropdown list in background window shows or hides\n\nThis is part of enabling GPU composition instead of using the MDP. This change\nis dependent on another change in the vendor project.\n\nSpecifically this change disables the use of EGLImageKHR for s/w buffers\nfor cache coherency reasons. memcpy is used instead.\n" }, { "commit": "aca29235a75bde8baf121b7e54b058d29f286003", "tree": "2d5bfea1c668196ea7caa827e0107accc8987388", "parents": [ "35ede78ede13fc2c4e7d343f50ca20372a404e06", "d12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Nov 13 17:46:31 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 13 17:46:31 2009 -0800" }, "message": "am d12ba5e0: (-s ours) Merge change Ibd5b099c into eclair\n\nMerge commit \u0027d12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9\u0027 into eclair-mr2\n\n* commit \u0027d12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9\u0027:\n Import revised translations. DO NOT MERGE\n" }, { "commit": "d12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9", "tree": "3376b794bfc2335fa19bae17746e32bff5bdac9e", "parents": [ "91e40e7838d183cb2a9e750edf0a6572f21da21d", "bd5b099c25eca35f1c0f5380534ed848e8c01b6c" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 17:42:19 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 17:42:19 2009 -0800" }, "message": "Merge change Ibd5b099c into eclair\n\n* changes:\n Import revised translations. DO NOT MERGE\n" }, { "commit": "35ede78ede13fc2c4e7d343f50ca20372a404e06", "tree": "2d5bfea1c668196ea7caa827e0107accc8987388", "parents": [ "0a27865a015d9e0401b6b3bff9eedd06d59043b3", "91e40e7838d183cb2a9e750edf0a6572f21da21d" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri Nov 13 17:33:52 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 13 17:33:52 2009 -0800" }, "message": "am 91e40e78: Merge change I18e02606 into eclair\n\nMerge commit \u002791e40e7838d183cb2a9e750edf0a6572f21da21d\u0027 into eclair-mr2\n\n* commit \u002791e40e7838d183cb2a9e750edf0a6572f21da21d\u0027:\n fix some aspects of [2258746] native crash in launcher2\n" }, { "commit": "91e40e7838d183cb2a9e750edf0a6572f21da21d", "tree": "86c02078a61ab272d9ebfe0a8b94fc45528efdae", "parents": [ "d54261aab0a96defc9584c4c59a3218015cdb1f7", "18e026066a95e5d63c2ece8007883b46599373ca" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 17:31:21 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 17:31:21 2009 -0800" }, "message": "Merge change I18e02606 into eclair\n\n* changes:\n fix some aspects of [2258746] native crash in launcher2\n" }, { "commit": "613438086cb68a4e0f48ddd51238f3d9a054ac9d", "tree": "5207db36644458bf7059c00c0a7b07a10e21f15e", "parents": [ "5da824210ee34f051c295c12f6bcc4b617da4a1a" ], "author": { "name": "Dan Egnor", "email": "egnor@google.com", "time": "Fri Nov 13 17:14:26 2009 -0800" }, "committer": { "name": "Dan Egnor", "email": "egnor@google.com", "time": "Fri Nov 13 17:14:26 2009 -0800" }, "message": "Remove external/protobuf from the build, now that it\u0027s\nbeen moved to vendor/google/libraries.\n" }, { "commit": "bd5b099c25eca35f1c0f5380534ed848e8c01b6c", "tree": "56317318494c80b81d75d3caad2507037cd1a814", "parents": [ "27d6e65b71f515deafbd93d5aa98732898c34ddf" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Nov 13 17:13:39 2009 -0800" }, "committer": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Nov 13 17:13:39 2009 -0800" }, "message": "Import revised translations. DO NOT MERGE\n\nApprover: jerryw\n" }, { "commit": "0a27865a015d9e0401b6b3bff9eedd06d59043b3", "tree": "927af9583c119a06732cdf0847a87aff07497684", "parents": [ "b2d7c60f125e243d915fae037b30f54110f1b237", "d54261aab0a96defc9584c4c59a3218015cdb1f7" ], "author": { "name": "Mike Cleron", "email": "mcleron@google.com", "time": "Fri Nov 13 17:03:31 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 13 17:03:31 2009 -0800" }, "message": "am d54261aa: Merge change Id6c0b844 into eclair\n\nMerge commit \u0027d54261aab0a96defc9584c4c59a3218015cdb1f7\u0027 into eclair-mr2\n\n* commit \u0027d54261aab0a96defc9584c4c59a3218015cdb1f7\u0027:\n Unbreak setting photos as wallpaper\n" }, { "commit": "d54261aab0a96defc9584c4c59a3218015cdb1f7", "tree": "cfe7d4cd2e2fd4938bdf07c522e3efad8b108d85", "parents": [ "ae2104371d84570011dbb8c1621832a132ed4584", "d6c0b844a0eb128a9429aa01d23d15ce095ef479" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 17:00:44 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 17:00:44 2009 -0800" }, "message": "Merge change Id6c0b844 into eclair\n\n* changes:\n Unbreak setting photos as wallpaper\n" }, { "commit": "d6c0b844a0eb128a9429aa01d23d15ce095ef479", "tree": "ceafcab803c15dc90ae08c2a001bd12d99644c66", "parents": [ "322b6ee7e158b0b979d8156df8fd59f4a9b95ab9" ], "author": { "name": "Mike Cleron", "email": "mcleron@google.com", "time": "Fri Nov 13 16:37:27 2009 -0800" }, "committer": { "name": "Mike Cleron", "email": "mcleron@google.com", "time": "Fri Nov 13 16:37:27 2009 -0800" }, "message": "Unbreak setting photos as wallpaper" }, { "commit": "60ff11dc393931c10845568bf43b6674dde04a82", "tree": "925abd667299f2acf56a3be3f53aeabceef42d78", "parents": [ "b4c20fca102a2ec6acf1648f2fd16d54fdc07f56" ], "author": { "name": "Fred Quintana", "email": "fredq@google.com", "time": "Fri Nov 13 16:21:52 2009 -0800" }, "committer": { "name": "Fred Quintana", "email": "fredq@google.com", "time": "Fri Nov 13 16:21:52 2009 -0800" }, "message": "fix an npe when a user tries to get an auth token from an authenticator that doesn\u0027t support it, like exchange\n" }, { "commit": "b2d7c60f125e243d915fae037b30f54110f1b237", "tree": "6db41785fbcc96e3a6a64b3e53e64bc30162bf97", "parents": [ "dc6563393789e90d75b44b9ce97c167863bf0771", "ae2104371d84570011dbb8c1621832a132ed4584" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Nov 13 15:47:16 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 13 15:47:16 2009 -0800" }, "message": "am ae210437: Merge change I7082e366 into eclair\n\nMerge commit \u0027ae2104371d84570011dbb8c1621832a132ed4584\u0027 into eclair-mr2\n\n* commit \u0027ae2104371d84570011dbb8c1621832a132ed4584\u0027:\n Properly implement Paint.breakText for layoutlib.\n" }, { "commit": "ae2104371d84570011dbb8c1621832a132ed4584", "tree": "4804bb6150572ceb10c00eed5bbfbf792bc299e1", "parents": [ "991475a2e5dcb344299387521b52fb637d6b1e4d", "76410f1eb316763018b7480d9cd8dc3684803576" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 15:42:31 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 15:42:31 2009 -0800" }, "message": "Merge change I7082e366 into eclair\n\n* changes:\n Properly implement Paint.breakText for layoutlib.\n" }, { "commit": "18e026066a95e5d63c2ece8007883b46599373ca", "tree": "e7c8d0f1e1cc5283222d635c595da3a2ce1bfc5f", "parents": [ "73f8aa678055598738dfba54c60a1674bcbf02b1" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri Nov 13 15:26:29 2009 -0800" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri Nov 13 15:26:29 2009 -0800" }, "message": "fix some aspects of [2258746] native crash in launcher2\n\nSurface::validate() could sometimes dereference a null pointer before checking it wasn\u0027t null.\nThis will prevent the application to crash when given bad parameters or used incorrectly.\nHowever, the bug above probably has another cause.\n" }, { "commit": "dc6563393789e90d75b44b9ce97c167863bf0771", "tree": "8b481771419df96837e22288b9297907edd4f106", "parents": [ "7d7257dd9cbe38453678f2803032e283a0344424", "991475a2e5dcb344299387521b52fb637d6b1e4d" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Nov 13 15:21:45 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 13 15:21:45 2009 -0800" }, "message": "am 991475a2: Merge change I0e419fcf into eclair\n\nMerge commit \u0027991475a2e5dcb344299387521b52fb637d6b1e4d\u0027 into eclair-mr2\n\n* commit \u0027991475a2e5dcb344299387521b52fb637d6b1e4d\u0027:\n Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager\n" }, { "commit": "991475a2e5dcb344299387521b52fb637d6b1e4d", "tree": "2f386aebfca838aa27f642f7eac29cb010bd7c60", "parents": [ "65f27f8721ae648ceffffb59a83e2af0d4641920", "746b3184bfe4973aa16055eff0adc89c7c77c7e2" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 15:17:59 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 15:17:59 2009 -0800" }, "message": "Merge change I0e419fcf into eclair\n\n* changes:\n Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager\n" }, { "commit": "7d7257dd9cbe38453678f2803032e283a0344424", "tree": "923a520b3cd6c43a6bbb1d56e144665e287cd410", "parents": [ "373329d477d2db20c66a85aa3e23a696d76a9954", "65f27f8721ae648ceffffb59a83e2af0d4641920" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Nov 13 14:57:20 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 13 14:57:20 2009 -0800" }, "message": "am 65f27f87: Merge change I98f82b9a into eclair\n\nMerge commit \u002765f27f8721ae648ceffffb59a83e2af0d4641920\u0027 into eclair-mr2\n\n* commit \u002765f27f8721ae648ceffffb59a83e2af0d4641920\u0027:\n Fix the full-weekday date format strings to actually use the full weekday.\n" }, { "commit": "65f27f8721ae648ceffffb59a83e2af0d4641920", "tree": "aefdf6fc560f5aa828080c07b69f1d44cc23f856", "parents": [ "73f8aa678055598738dfba54c60a1674bcbf02b1", "66668524d452ae536a32d15ffd0dcb096de665df" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 14:51:00 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 14:51:00 2009 -0800" }, "message": "Merge change I98f82b9a into eclair\n\n* changes:\n Fix the full-weekday date format strings to actually use the full weekday.\n" }, { "commit": "746b3184bfe4973aa16055eff0adc89c7c77c7e2", "tree": "f60e791ca5961a1b29197fcc0c34b7252b7746f3", "parents": [ "27d6e65b71f515deafbd93d5aa98732898c34ddf" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Nov 13 17:40:38 2009 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Nov 13 17:40:38 2009 -0500" }, "message": "Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager\n\nNeeded for the fix for b/2260437 (device wakes itself back up when camera is last application running)\n\nChange-Id: I0e419fcf05542df203eb3f127dde7a888416e86d\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "76410f1eb316763018b7480d9cd8dc3684803576", "tree": "a770dc9ce917cc36307e6ed9cc20961ea2d498cd", "parents": [ "27d6e65b71f515deafbd93d5aa98732898c34ddf" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Nov 13 14:10:20 2009 -0800" }, "committer": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Fri Nov 13 14:10:20 2009 -0800" }, "message": "Properly implement Paint.breakText for layoutlib.\n\nBUG 2260400\n\nChange-Id: I7082e366b65da0b5de2a6dbb547f66e05e0b78e0\n" }, { "commit": "373329d477d2db20c66a85aa3e23a696d76a9954", "tree": "79a04658bd7b4e12aabae884204eaf407775672b", "parents": [ "235657dbe06c4fea8860ec9fef834a6b36da9700", "736c525a04a4d5e1c83541deca009ca97b99ef92" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 14:05:20 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 14:05:20 2009 -0800" }, "message": "Merge change I736c525a into eclair-mr2\n\n* changes:\n update dox to account for different behavior between AVOID and TARGET modes\n" }, { "commit": "66668524d452ae536a32d15ffd0dcb096de665df", "tree": "acd5b0150690f4b6d1fb1030c1c49d8c41a3e550", "parents": [ "27d6e65b71f515deafbd93d5aa98732898c34ddf" ], "author": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Nov 13 11:08:36 2009 -0800" }, "committer": { "name": "Eric Fischer", "email": "enf@google.com", "time": "Fri Nov 13 14:04:03 2009 -0800" }, "message": "Fix the full-weekday date format strings to actually use the full weekday.\n\nAlso fix the abbreviated weekday/month/day/year strings to use a 4-digit year.\n\nApprover: jerryw\n" }, { "commit": "235657dbe06c4fea8860ec9fef834a6b36da9700", "tree": "7a1765d93e5fe383ce934b3a7dba1193f2c8f1b1", "parents": [ "f05ec9237ec907be3f2c581a950149435bd585fb", "73f8aa678055598738dfba54c60a1674bcbf02b1" ], "author": { "name": "Nicolas Catania", "email": "niko@google.com", "time": "Fri Nov 13 13:43:32 2009 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 13 13:43:32 2009 -0800" }, "message": "am 73f8aa67: Merge change I4898b145 into eclair\n\nMerge commit \u002773f8aa678055598738dfba54c60a1674bcbf02b1\u0027 into eclair-mr2\n\n* commit \u002773f8aa678055598738dfba54c60a1674bcbf02b1\u0027:\n Removed the fixed height in the sim unlock screen\u0027s header.\n" }, { "commit": "73f8aa678055598738dfba54c60a1674bcbf02b1", "tree": "33af18c47b0c3eacede38d9499beb6789c5d8952", "parents": [ "9284dec737da58a92b3aa916a357e700d291a68a", "4898b145bdc77941b6452c46f469c74181887b0e" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 13:39:01 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 13:39:01 2009 -0800" }, "message": "Merge change I4898b145 into eclair\n\n* changes:\n Removed the fixed height in the sim unlock screen\u0027s header.\n" }, { "commit": "f05ec9237ec907be3f2c581a950149435bd585fb", "tree": "0800fb35cabb4e21d9ffbcdfdbe6e377e1c0e812", "parents": [ "94140b35541b955589f878ce6b26b65c3b3e18ac" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Fri Nov 13 13:08:52 2009 -0800" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Fri Nov 13 13:08:52 2009 -0800" }, "message": "Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf\n\nAdd check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,\ndo not add \"TEL\" to vcard data.\n\nManual merge from eclair branch\n" }, { "commit": "94140b35541b955589f878ce6b26b65c3b3e18ac", "tree": "2b52711dc045491ace06f09fc69d5949f140e368", "parents": [ "5da824210ee34f051c295c12f6bcc4b617da4a1a", "9284dec737da58a92b3aa916a357e700d291a68a" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Fri Nov 13 13:02:02 2009 -0800" }, "committer": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Fri Nov 13 13:02:02 2009 -0800" }, "message": "Merge commit \u00279284dec7\u0027 into merge\n" }, { "commit": "9284dec737da58a92b3aa916a357e700d291a68a", "tree": "09da7b8fef7ffbb7265b2218b1d91d5ebfe76939", "parents": [ "27d6e65b71f515deafbd93d5aa98732898c34ddf", "4c05ba1fcc6abcf199fc82505465a97fc7de553d" ], "author": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 12:06:29 2009 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 13 12:06:29 2009 -0800" }, "message": "Merge change I4c05ba1f into eclair\n\n* changes:\n Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf\n" } ], "next": "5da824210ee34f051c295c12f6bcc4b617da4a1a" }