)]}' { "log": [ { "commit": "942bc252ce7dbd229e28ee3a44dc94e1dd0b0d90", "tree": "daeccd1270d7bec3f9a9caa944a249d8d996c43f", "parents": [ "9fd4c6d3aeea46820c7ab637b0bc6556b798bc2b", "fcdbcf9174f7a5404da4514b71041c3d37692d15" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue May 24 12:57:08 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 12:57:08 2011 -0700" }, "message": "am fcdbcf91: (-s ours) am 5b00912e: am 51652f56: Merge \"DO NOT MERGE. Preference activity changes to work on smaller tablet screens.\" into honeycomb-mr2\n\n* commit \u0027fcdbcf9174f7a5404da4514b71041c3d37692d15\u0027:\n DO NOT MERGE. Preference activity changes to work on smaller tablet screens.\n" }, { "commit": "9fd4c6d3aeea46820c7ab637b0bc6556b798bc2b", "tree": "daeccd1270d7bec3f9a9caa944a249d8d996c43f", "parents": [ "aa9fff8cb457cb5330390dcd82868a0f480a26fe", "49b9449b6605c7b4f77f9a0635ba93f7dfa0ea47" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue May 24 12:56:56 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 12:56:56 2011 -0700" }, "message": "am 49b9449b: am d8d84708: am 988b6648: Merge \"MountService: Add StorageVolume as extra in storage related broadcasts.\" into honeycomb-mr2\n\n* commit \u002749b9449b6605c7b4f77f9a0635ba93f7dfa0ea47\u0027:\n MountService: Add StorageVolume as extra in storage related broadcasts.\n" }, { "commit": "aa9fff8cb457cb5330390dcd82868a0f480a26fe", "tree": "97d5f5d08af6b787cdb4686ebb0679f367e63ac3", "parents": [ "c42b791b7484ee3f1e42a70c691c6945bc52c153", "f656d95078fbcb65df7753ba8c04679c5389e15c" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Tue May 24 12:56:32 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 12:56:32 2011 -0700" }, "message": "am f656d950: (-s ours) am 82de141d: am 4a74eb67: Merge \"DO NOT MERGE Use previous version if version is a codename\" into honeycomb-mr2\n\n* commit \u0027f656d95078fbcb65df7753ba8c04679c5389e15c\u0027:\n DO NOT MERGE Use previous version if version is a codename\n" }, { "commit": "c42b791b7484ee3f1e42a70c691c6945bc52c153", "tree": "97d5f5d08af6b787cdb4686ebb0679f367e63ac3", "parents": [ "43175dde741aaef0ad4e8e01a59ea96d603973dc", "e2c7715c772d5121397591b532d04a31b3ffcc99" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue May 24 12:44:07 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 24 12:44:07 2011 -0700" }, "message": "Merge \"resolved conflicts for merge of bbca8133 to master\"" }, { "commit": "43175dde741aaef0ad4e8e01a59ea96d603973dc", "tree": "4c6afda66bb4427cd9a41f3ab3fbfd7998ee89b1", "parents": [ "20ce4a49af0668a7e542cabcf7c5c0ecb551b90f", "c0bd9bcdd9fa2de9a11c09418208702d0791555a" ], "author": { "name": "RoboErik", "email": "epastern@google.com", "time": "Tue May 24 11:34:45 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 24 11:34:45 2011 -0700" }, "message": "Merge \"Add original_id definition for cal db v301\"" }, { "commit": "e2c7715c772d5121397591b532d04a31b3ffcc99", "tree": "a528b89349ba2b367aeae8b442b5c696a7c8c99e", "parents": [ "6895c4994350bc10a06481ecf42c4ba8abb3eedb", "bbca81334e3603c7328dc526bd63032b23d5261d" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue May 24 11:27:11 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue May 24 11:27:11 2011 -0700" }, "message": "resolved conflicts for merge of bbca8133 to master\n\nChange-Id: I81493674dceab848e41d380a77a37e5a9be06db6\n" }, { "commit": "20ce4a49af0668a7e542cabcf7c5c0ecb551b90f", "tree": "47a4a65d9686674aa5cf43940188e6ab238020b3", "parents": [ "ee864481e9c396e46ad5c56e76811f79d250d9ba", "9eed25e2576403a91826312381f4507e8c8171c2" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Tue May 24 10:55:17 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 24 10:55:17 2011 -0700" }, "message": "Merge \"In DRT2, correctly handle the case of zero tests\"" }, { "commit": "9eed25e2576403a91826312381f4507e8c8171c2", "tree": "d15e1c88228019d17435f20d7d7b4e1edceb3d4c", "parents": [ "183c3c9ca20f55703f31e3610bca72682f6355db" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Fri May 20 17:26:47 2011 +0100" }, "committer": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Tue May 24 18:54:14 2011 +0100" }, "message": "In DRT2, correctly handle the case of zero tests\n\nBug: 3291382\nChange-Id: I8cde1d8d78a57407c585b02ca8ba3f3f893a609b\n" }, { "commit": "ee864481e9c396e46ad5c56e76811f79d250d9ba", "tree": "c3d6425832499b294d08708d0536bca4fb0e2501", "parents": [ "970ce730175e1d27ce3fc7c179f2d24ecc1b5213", "183c3c9ca20f55703f31e3610bca72682f6355db" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Tue May 24 10:48:21 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 24 10:48:21 2011 -0700" }, "message": "Merge changes Ibe495cdc,I6f8e5745\n\n* changes:\n Update DRT2 to reflect WebKit code movement\n Add extra error handling to DRT2 launcher script\n" }, { "commit": "183c3c9ca20f55703f31e3610bca72682f6355db", "tree": "b6871e4bd4703bd1b9dcfc314d34a4d51a763e3f", "parents": [ "31e446c3db9031f69641c8ce7be8e396aeb60caa" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Mon May 23 12:14:12 2011 +0100" }, "committer": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Tue May 24 18:46:35 2011 +0100" }, "message": "Update DRT2 to reflect WebKit code movement\n\nSee http://trac.webkit.org/changeset/74301\n\nChange-Id: Ibe495cdc1f50f65db5663dbb63af9b9c2db050d0\n" }, { "commit": "31e446c3db9031f69641c8ce7be8e396aeb60caa", "tree": "2643b302439accec66a8eeb6ca7556e58a9b9733", "parents": [ "bdd8a16282cf85bfdbe4c15adcd5c37db772de11" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Fri May 20 17:39:30 2011 +0100" }, "committer": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Tue May 24 18:46:34 2011 +0100" }, "message": "Add extra error handling to DRT2 launcher script\n\nBug: 3291220\nChange-Id: I6f8e57458cd4334a998eb256af303ffcd9c50d64\n" }, { "commit": "970ce730175e1d27ce3fc7c179f2d24ecc1b5213", "tree": "6b15837e1a537ebfb692ea1bb348c25ff1d659d9", "parents": [ "bd4d5826228d3c3c55a52aa7e175559509ec3498", "9511b41e05312f1f5ed88d22040876218d7bfdd4" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Tue May 24 09:26:43 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 24 09:26:44 2011 -0700" }, "message": "Merge \"Made getOffsetForPosition public in TextView.\"" }, { "commit": "bd4d5826228d3c3c55a52aa7e175559509ec3498", "tree": "f77f3c0b7c622c4487d6971a7a3dea436ee68c08", "parents": [ "7a4adca1cb1904e98cc695e7b7707b5d7d7dcd89", "3bca69b09fb51116b5eb18fb91cb991c1450e384" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Tue May 24 09:26:14 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 24 09:26:14 2011 -0700" }, "message": "Merge \"TextView uses floats for touch event positions.\"" }, { "commit": "7a4adca1cb1904e98cc695e7b7707b5d7d7dcd89", "tree": "388b62ef2b120a0b9f35867fde04c774ac95d6c0", "parents": [ "6895c4994350bc10a06481ecf42c4ba8abb3eedb", "f3a135bfbae0e64cf32dcb21714420ec974b1cab" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Tue May 24 09:25:52 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 24 09:25:52 2011 -0700" }, "message": "Merge \"Added a new flag in TextView to disable Suggestions.\"" }, { "commit": "6895c4994350bc10a06481ecf42c4ba8abb3eedb", "tree": "305e91c7d9409789f3c3594c895001aa64f8789e", "parents": [ "fb9eebc42744598ed3360c1dc485cf2509145b79", "98a8231e838d7d624c5862d81d1975ef4f8d0d57" ], "author": { "name": "TK MUN", "email": "tk.mun@samsung.com", "time": "Tue May 24 08:44:12 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 08:44:12 2011 -0700" }, "message": "am 98a8231e: (-s ours) am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received\n\n* commit \u002798a8231e838d7d624c5862d81d1975ef4f8d0d57\u0027:\n DO NOT MERGE SystemUI: update signal level when broadcast is received\n" }, { "commit": "fb9eebc42744598ed3360c1dc485cf2509145b79", "tree": "305e91c7d9409789f3c3594c895001aa64f8789e", "parents": [ "9a4285474c2eddf45dc5c184a58fe8113afbe1b9", "9a8ea20d4b3975d3f771364fb9f2272c32f8cad1" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Tue May 24 08:42:10 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 08:42:10 2011 -0700" }, "message": "am 9a8ea20d: am 070eecef: Merge \"Map multiple apnType to one DataConnection fixes.\" into honeycomb-LTE\n\n* commit \u00279a8ea20d4b3975d3f771364fb9f2272c32f8cad1\u0027:\n Map multiple apnType to one DataConnection fixes.\n" }, { "commit": "9a4285474c2eddf45dc5c184a58fe8113afbe1b9", "tree": "d79283c06b020a1a41e7f3a89fa384e2b0d6cb58", "parents": [ "5b0724d6cfb3f4019ba3692f1648af845fb0f3b4", "b1817383050986413805fbbf2c1cc5c03417574d" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Tue May 24 08:42:05 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 08:42:05 2011 -0700" }, "message": "am b1817383: am d3924fe9: Merge \"Data Connection: Use Alarm for all delayed data retries.\" into honeycomb-LTE\n\n* commit \u0027b1817383050986413805fbbf2c1cc5c03417574d\u0027:\n Data Connection: Use Alarm for all delayed data retries.\n" }, { "commit": "5b0724d6cfb3f4019ba3692f1648af845fb0f3b4", "tree": "0f7f9cd8b8fa2914b6c824beed98b26d2808ab35", "parents": [ "2646219aaac42913f9ee6c07b04140b0e6475bc0", "f55a00b1b86c58d78a4c2812d00e1b61d03f520a" ], "author": { "name": "Shimeng (Simon) Wang", "email": "swang@google.com", "time": "Tue May 24 08:41:37 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 08:41:37 2011 -0700" }, "message": "am f55a00b1: am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.\n\n* commit \u0027f55a00b1b86c58d78a4c2812d00e1b61d03f520a\u0027:\n Simplify browser pause/resume logic to avoid stuck timer.\n" }, { "commit": "2646219aaac42913f9ee6c07b04140b0e6475bc0", "tree": "0ed0c1575d077d6e4be303218409b7b233c170db", "parents": [ "9dd85837e3947f373bf8a8debe0f59535c643892", "d5762583bd1eb37da6c09461e8b2453c83a600a6" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue May 24 08:04:45 2011 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue May 24 08:04:45 2011 -0700" }, "message": "resolved conflicts for merge of d5762583 to master\n\nChange-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd\n" }, { "commit": "9dd85837e3947f373bf8a8debe0f59535c643892", "tree": "9a5c708514e448d5bf392088930e496a04b77d6d", "parents": [ "1ff04d8e567c03f697d99027e64ea31f5043fba7", "46e802e9c12befcd477e59437c5de3f0889aef4e" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue May 24 02:57:37 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 02:57:37 2011 -0700" }, "message": "am 46e802e9: (-s ours) am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.\n\n* commit \u002746e802e9c12befcd477e59437c5de3f0889aef4e\u0027:\n Merge e57aa434 from honeycomb-mr1. do not merge.\n" }, { "commit": "1ff04d8e567c03f697d99027e64ea31f5043fba7", "tree": "9a5c708514e448d5bf392088930e496a04b77d6d", "parents": [ "690a9bb8ade4d5639cbdbd1120e29e280819cdca", "ea182704b60551a9bd7760aa9d206ca7a7e407b8" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue May 24 02:57:31 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 02:57:31 2011 -0700" }, "message": "am ea182704: (-s ours) am 041fd74b: (-s ours) am f791863f: Merge \"Merge 05b7b69c from honeycomb-mr1. do not merge.\" into gingerbread\n\n* commit \u0027ea182704b60551a9bd7760aa9d206ca7a7e407b8\u0027:\n Merge 05b7b69c from honeycomb-mr1. do not merge.\n" }, { "commit": "690a9bb8ade4d5639cbdbd1120e29e280819cdca", "tree": "9a5c708514e448d5bf392088930e496a04b77d6d", "parents": [ "3dbc571e62d8c63a55f5e2e58ea22aa6ebf0df39", "162dd490cd0b502c717db59300b3fd902f76710a" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Tue May 24 02:57:11 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 02:57:11 2011 -0700" }, "message": "am 162dd490: (-s ours) am 9d9a7466: (-s ours) am bb43828a: Merge \"Merge 2fae858d from Honeycomb-mr1. do not merge.\" into gingerbread\n\n* commit \u0027162dd490cd0b502c717db59300b3fd902f76710a\u0027:\n Merge 2fae858d from Honeycomb-mr1. do not merge.\n" }, { "commit": "3dbc571e62d8c63a55f5e2e58ea22aa6ebf0df39", "tree": "9a5c708514e448d5bf392088930e496a04b77d6d", "parents": [ "eb1fbf7a4516dcb44bf5acb2e17ae5955db2afdb", "6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Tue May 24 02:56:15 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 02:56:15 2011 -0700" }, "message": "am 6056e326: am f96a6150: Data reconnection issue after airplane mode\n\n* commit \u00276056e3268a0aa114ad99e3e6ddaebe0ebfa6035e\u0027:\n Data reconnection issue after airplane mode\n" }, { "commit": "eb1fbf7a4516dcb44bf5acb2e17ae5955db2afdb", "tree": "0ee428f9142c54099750ec506985a7d11c149e50", "parents": [ "cb3fad5cbeffd876057921ddae3752a740fb7590", "8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Tue May 24 02:56:08 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 02:56:08 2011 -0700" }, "message": "am 8e1f6ece: am 4c88be65: GSM DCT: Update poll stats to support multi-links\n\n* commit \u00278e1f6eceb3fbdb478e83f14d021a77ee339ffb2e\u0027:\n GSM DCT: Update poll stats to support multi-links\n" }, { "commit": "cb3fad5cbeffd876057921ddae3752a740fb7590", "tree": "b29dc77f0fb4843540a6f5614eb0cbec650a96fc", "parents": [ "d24c1dfe2b655a3243dc7608ceb18dbb913862d8", "7abbf93c854cd7d272183b674373e989a05da6dd" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Tue May 24 02:38:17 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 02:38:17 2011 -0700" }, "message": "am 7abbf93c: am 15cd6ec2: Tear down connection with unwanted linkproperty change\n\n* commit \u00277abbf93c854cd7d272183b674373e989a05da6dd\u0027:\n Tear down connection with unwanted linkproperty change\n" }, { "commit": "d24c1dfe2b655a3243dc7608ceb18dbb913862d8", "tree": "cbe0096ca0d206dedcf17ceedb237aef3d6ac779", "parents": [ "28793432911055e27b735ecd9be169a701d7e69a", "f7bc0e28bf66c20ef233a161cd1d50a009013ab0" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Tue May 24 00:39:54 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 00:39:54 2011 -0700" }, "message": "am f7bc0e28: am 16e8d22b: Fix build.\n\n* commit \u0027f7bc0e28bf66c20ef233a161cd1d50a009013ab0\u0027:\n Fix build.\n" }, { "commit": "28793432911055e27b735ecd9be169a701d7e69a", "tree": "cbe0096ca0d206dedcf17ceedb237aef3d6ac779", "parents": [ "595881ee5ebc6b7d12246eb4c0458fb0f9f17bb9" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 21:56:11 2011 -0700" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 21:56:11 2011 -0700" }, "message": "Fix build.\n\nA merge accidentally included a line that was deleted.\n\nChange-Id: Id383b1d8808f1c4b12d3ad1372270601f92f5989\n" }, { "commit": "595881ee5ebc6b7d12246eb4c0458fb0f9f17bb9", "tree": "01df9d04a5568d8d4b0b2d53cc37cf6426be8b3c", "parents": [ "5ea7a29387f28c8b8b8bc745ba2190a944be3c34", "f8d70b14e4285d17d83cc4853f50b44d6a55fbc7" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 20:49:05 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 20:49:05 2011 -0700" }, "message": "am f8d70b14: am 5f353de9: Merge \"Notify RIL that PDP reset is triggered due to data stall\" into honeycomb-LTE\n\n* commit \u0027f8d70b14e4285d17d83cc4853f50b44d6a55fbc7\u0027:\n Notify RIL that PDP reset is triggered due to data stall\n" }, { "commit": "5ea7a29387f28c8b8b8bc745ba2190a944be3c34", "tree": "a43b3b0e04ff36d25a30cf5c668321dc3f78c033", "parents": [ "a0bb3acba1e848ac752eb5e1e3da1b0a6cc5d514", "b7a13791a12eef57434b84a97609d98e03e17009" ], "author": { "name": "John Wang", "email": "johnwang@google.com", "time": "Mon May 23 20:48:57 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 20:48:57 2011 -0700" }, "message": "am b7a13791: am 393eb0d0: Merge \"Add UI to handle SIM swap.\" into honeycomb-LTE\n\n* commit \u0027b7a13791a12eef57434b84a97609d98e03e17009\u0027:\n Add UI to handle SIM swap.\n" }, { "commit": "a0bb3acba1e848ac752eb5e1e3da1b0a6cc5d514", "tree": "45f55ed6e119f46273c7df2c5908451139473fd5", "parents": [ "23186b88bdfe6c602dce0bee40ffbf2253eb044c", "59a3319ffce100d671145b5bfee7450038b250bf" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Mon May 23 20:48:36 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 20:48:36 2011 -0700" }, "message": "am 59a3319f: am 67cd389d: am 2c7906eb: Merge \"Fix 4462474: Use new sw600dp resource target for LockScreen \u0026 SystemUI\" into honeycomb-mr2\n\n* commit \u002759a3319ffce100d671145b5bfee7450038b250bf\u0027:\n Fix 4462474: Use new sw600dp resource target for LockScreen \u0026 SystemUI\n" }, { "commit": "23186b88bdfe6c602dce0bee40ffbf2253eb044c", "tree": "945fc44dadf00746fb2e57b3c697f45b910e5aea", "parents": [ "348a48fc706256133c8b9e25a4a090a7ad07808e", "75d27bc52eb0e66c7fb829056fce59a8662c5bba" ], "author": { "name": "Tadashi G. Takaoka", "email": "takaoka@google.com", "time": "Mon May 23 19:00:01 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 19:00:01 2011 -0700" }, "message": "Merge \"Add new imeFullscreenBackground for Theme.InputMethod.Holo\"" }, { "commit": "9511b41e05312f1f5ed88d22040876218d7bfdd4", "tree": "2ffa1b93a46e6199616799f6445800400549e736", "parents": [ "3bca69b09fb51116b5eb18fb91cb991c1450e384" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Mon May 23 18:33:48 2011 -0700" }, "committer": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Mon May 23 18:48:26 2011 -0700" }, "message": "Made getOffsetForPosition public in TextView.\n\nBug 4443839\n\nChange-Id: I3e5d6f0fe3a45b068166f682daf3c4163903306e\n" }, { "commit": "348a48fc706256133c8b9e25a4a090a7ad07808e", "tree": "e3a5928b4a0c64937e0afd75d3ce2f15d1d946be", "parents": [ "8c777edea265bd9908188bf5cb3e3c1729ed9b7c", "a4620793038b9a9163b26c6ece882cb454fcbf87" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon May 23 18:47:11 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 18:47:11 2011 -0700" }, "message": "Merge \"Observe screen on/off events in NetworkPolicy.\"" }, { "commit": "a4620793038b9a9163b26c6ece882cb454fcbf87", "tree": "450e8f355658bcc56bf19dc00f8c63d3464cb69f", "parents": [ "442fa21e98835ceb966f196906907eb236d38d65" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Fri May 20 15:29:23 2011 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon May 23 18:39:56 2011 -0700" }, "message": "Observe screen on/off events in NetworkPolicy.\n\nThe POLICY_REJECT_BACKGROUND policy requires that network traffic be\nblocked when a UID goes into the background. Even if the UID has an\nactivity in the foreground, it\u0027s considered \"background\" if the screen\nis turned off.\n\nThis changes watches for SCREEN_ON/OFF broadcasts, and rule generation\nnow observes screen state. It also introduces an observer pattern so\nthat ActivityManager doesn\u0027t directly know about NetworkPolicy, and\nmoves the service management into SystemServer.\n\nChange-Id: Ie7a84929d3ca60ae4578d47e19d5a8da10fd8d58\n" }, { "commit": "8c777edea265bd9908188bf5cb3e3c1729ed9b7c", "tree": "797e2ed9d1e17f892b34eae8ac4f3e470abcbda6", "parents": [ "442fa21e98835ceb966f196906907eb236d38d65", "f56a960105916a7fd12284109784e5f667661439" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon May 23 18:39:40 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 18:39:40 2011 -0700" }, "message": "Merge \"fix x86 build\"" }, { "commit": "442fa21e98835ceb966f196906907eb236d38d65", "tree": "8a343e88f27371e0b02f0f25df869e38e079b779", "parents": [ "9ddcdd98d97b2d5026d62d2b60c8582515381eaf", "eedcb9525ba5befee2ba6ebb7a9ee3f13395c2a3" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Mon May 23 18:38:04 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 18:38:04 2011 -0700" }, "message": "Merge \"APIs to profile network usage for current UID.\"" }, { "commit": "75d27bc52eb0e66c7fb829056fce59a8662c5bba", "tree": "bab666c0cb5438784040492d00137cd398141a17", "parents": [ "8508485871dd22a998db98ea97403126918c5fa8" ], "author": { "name": "Tadashi G. Takaoka", "email": "takaoka@google.com", "time": "Wed May 18 12:19:55 2011 +0900" }, "committer": { "name": "Tadashi G. Takaoka", "email": "takaoka@google.com", "time": "Tue May 24 10:27:43 2011 +0900" }, "message": "Add new imeFullscreenBackground for Theme.InputMethod.Holo\n\nThis change also removes unnecessary background from ExtractEditText\n\nBug: 4431328\nChange-Id: I1b35ddd388fe11cac9b7f9dd3f990b6c4d889185\n" }, { "commit": "9ddcdd98d97b2d5026d62d2b60c8582515381eaf", "tree": "4c3543fb935f4a8364e837e177561594e2bf23bf", "parents": [ "7d372b49e2691967fab3a9d63103bab1b1ff205e", "0ba625259e8c4af3df2c7823fc1d18b42d760a44" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 18:25:52 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 18:25:52 2011 -0700" }, "message": "am 0ba62525: am 2b534e77: Merge \"Fix broken data retry\" into honeycomb-LTE\n\n* commit \u00270ba625259e8c4af3df2c7823fc1d18b42d760a44\u0027:\n Fix broken data retry\n" }, { "commit": "3bca69b09fb51116b5eb18fb91cb991c1450e384", "tree": "10206d1d52c4c4a16e7805762ed04a28f0bbbb55", "parents": [ "37cd57772b27bb286aeec915cfaced4fa08508bd" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Mon May 23 18:20:22 2011 -0700" }, "committer": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Mon May 23 18:20:26 2011 -0700" }, "message": "TextView uses floats for touch event positions.\n\nThis is the type returned by event.getX/Y methods. Conversion\nto ints is only performed when needed. Low performance impact\nsince there is only a minimal amount of computations on these\nvalues.\n\nChange-Id: I53a56efe5e3a1a96911adc25fedaab7f40f1ba8e\n" }, { "commit": "f56a960105916a7fd12284109784e5f667661439", "tree": "c9fa837dcead24d70a36167e9e3e338f6ae7e4b3", "parents": [ "8e4ee2d709bb76454d0571d13128bd68c894633a" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon May 23 17:26:14 2011 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon May 23 17:48:36 2011 -0700" }, "message": "fix x86 build\n\nChange-Id: I03cfbfeaeb8b13842248856b14b4a23711036e10\n" }, { "commit": "7d372b49e2691967fab3a9d63103bab1b1ff205e", "tree": "77550c495c04ecc21de15ff474561d83ed0b11fd", "parents": [ "ed5af6d93b2758b86175b13c380fcd164e537a7c", "7dfdb914206eafbf2aa4533e9b6a50428a5d0d3d" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon May 23 17:18:54 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 17:18:54 2011 -0700" }, "message": "am 7dfdb914: am f483ed90: am bdc26dc3: Merge \"Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.\" into honeycomb-mr2\n\n* commit \u00277dfdb914206eafbf2aa4533e9b6a50428a5d0d3d\u0027:\n Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.\n" }, { "commit": "ed5af6d93b2758b86175b13c380fcd164e537a7c", "tree": "8ed899f00839af05f26aa12dbf2c216544e189af", "parents": [ "37cd57772b27bb286aeec915cfaced4fa08508bd", "61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 17:18:29 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 17:18:29 2011 -0700" }, "message": "am 61a5ab57: am f89ea7a5: Merge \"Change getLteOnCdmaModeStatic to dynamically determine its result.\" into honeycomb-LTE\n\n* commit \u002761a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0\u0027:\n Change getLteOnCdmaModeStatic to dynamically determine its result.\n" }, { "commit": "f3a135bfbae0e64cf32dcb21714420ec974b1cab", "tree": "c0e0766cfb24b3b8598af7187b8e987dacfbc78b", "parents": [ "37cd57772b27bb286aeec915cfaced4fa08508bd" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Mon May 23 16:28:47 2011 -0700" }, "committer": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Mon May 23 17:15:20 2011 -0700" }, "message": "Added a new flag in TextView to disable Suggestions.\n\nThis is needed for specific TextEdit (such as AutoCompleteTextField)\nwhich do not want to display the \"No suggestions available\" message.\n\nBug 4443830\n\nChange-Id: Ic228b56bacfdf2765e70eb24952ab087556c1f93\n" }, { "commit": "fcdbcf9174f7a5404da4514b71041c3d37692d15", "tree": "5dae786ef19532cc2ac011cb98790512109fe529", "parents": [ "49b9449b6605c7b4f77f9a0635ba93f7dfa0ea47", "5b00912e5844591a846e8ba3c4710d2daaa8069a" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Mon May 23 17:12:00 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 17:12:00 2011 -0700" }, "message": "am 5b00912e: am 51652f56: Merge \"DO NOT MERGE. Preference activity changes to work on smaller tablet screens.\" into honeycomb-mr2\n\n* commit \u00275b00912e5844591a846e8ba3c4710d2daaa8069a\u0027:\n DO NOT MERGE. Preference activity changes to work on smaller tablet screens.\n" }, { "commit": "49b9449b6605c7b4f77f9a0635ba93f7dfa0ea47", "tree": "2c95d482ab6a8c353cff4cd6672179c0ff70eda3", "parents": [ "f656d95078fbcb65df7753ba8c04679c5389e15c", "d8d8470825a637843d45a3b436e80a3b85f1dd11" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 23 17:09:30 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 17:09:30 2011 -0700" }, "message": "am d8d84708: am 988b6648: Merge \"MountService: Add StorageVolume as extra in storage related broadcasts.\" into honeycomb-mr2\n\n* commit \u0027d8d8470825a637843d45a3b436e80a3b85f1dd11\u0027:\n MountService: Add StorageVolume as extra in storage related broadcasts.\n" }, { "commit": "5b00912e5844591a846e8ba3c4710d2daaa8069a", "tree": "f423cb8dd4d1f97e648c8cd090c2ac20937d5a8c", "parents": [ "d8d8470825a637843d45a3b436e80a3b85f1dd11", "51652f5674e266d62607324255517d41d225d9be" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Mon May 23 17:08:48 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 17:08:48 2011 -0700" }, "message": "am 51652f56: Merge \"DO NOT MERGE. Preference activity changes to work on smaller tablet screens.\" into honeycomb-mr2\n\n* commit \u002751652f5674e266d62607324255517d41d225d9be\u0027:\n DO NOT MERGE. Preference activity changes to work on smaller tablet screens.\n" }, { "commit": "d8d8470825a637843d45a3b436e80a3b85f1dd11", "tree": "b1086bd2f87c4454ce33e1fc9a8db00e53479ece", "parents": [ "82de141db736b95b0e388ff060e2d2535192d769", "988b6648b0138fe1294228e17164b2f1d6a4042d" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 23 17:06:47 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 17:06:47 2011 -0700" }, "message": "am 988b6648: Merge \"MountService: Add StorageVolume as extra in storage related broadcasts.\" into honeycomb-mr2\n\n* commit \u0027988b6648b0138fe1294228e17164b2f1d6a4042d\u0027:\n MountService: Add StorageVolume as extra in storage related broadcasts.\n" }, { "commit": "51652f5674e266d62607324255517d41d225d9be", "tree": "1f4687b688dc7d77a2d21ef47cd20b80c1d6df44", "parents": [ "988b6648b0138fe1294228e17164b2f1d6a4042d", "1d2385d08a9e706243fdf9399b417ad7e24c19ba" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Mon May 23 17:05:47 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 17:05:47 2011 -0700" }, "message": "Merge \"DO NOT MERGE. Preference activity changes to work on smaller tablet screens.\" into honeycomb-mr2" }, { "commit": "988b6648b0138fe1294228e17164b2f1d6a4042d", "tree": "d1fd279b7e6f0b48201f7e96eb531394401fcd18", "parents": [ "4a74eb679917797bf77a20773e0c079f5cc808e4", "a5250c93928e256738125b265e10c96c3575597e" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 23 17:04:01 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 17:04:01 2011 -0700" }, "message": "Merge \"MountService: Add StorageVolume as extra in storage related broadcasts.\" into honeycomb-mr2" }, { "commit": "a5250c93928e256738125b265e10c96c3575597e", "tree": "0461f4f237d6aaad4838f6b8566aa3c237fda5c3", "parents": [ "2c7906eb392c6349e6f75fd2681310b934d6e262" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 23 13:44:04 2011 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 23 20:01:55 2011 -0400" }, "message": "MountService: Add StorageVolume as extra in storage related broadcasts.\n\nChange-Id: I8e1a21ae233ba9812e58b363b59a66b260a01cbf\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "37cd57772b27bb286aeec915cfaced4fa08508bd", "tree": "2336b3714cdbbd15a54dd59c10a69dcfee29bdf3", "parents": [ "560e97f8e0cb63a0fa6e88db6badc142a99517d2", "939461300a0283a9f370a0425d4061d32b36f952" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 23 16:59:20 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 16:59:20 2011 -0700" }, "message": "Merge \"resolved conflicts for merge of 070a19e0 to master\"" }, { "commit": "f656d95078fbcb65df7753ba8c04679c5389e15c", "tree": "72f1392cf678c379727452102128850220b5943b", "parents": [ "bbca81334e3603c7328dc526bd63032b23d5261d", "82de141db736b95b0e388ff060e2d2535192d769" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon May 23 16:53:28 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 16:53:28 2011 -0700" }, "message": "am 82de141d: am 4a74eb67: Merge \"DO NOT MERGE Use previous version if version is a codename\" into honeycomb-mr2\n\n* commit \u002782de141db736b95b0e388ff060e2d2535192d769\u0027:\n DO NOT MERGE Use previous version if version is a codename\n" }, { "commit": "1d2385d08a9e706243fdf9399b417ad7e24c19ba", "tree": "ea9dae8178813148c45c51dc2fc0c075604cc037", "parents": [ "4a74eb679917797bf77a20773e0c079f5cc808e4" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Fri May 20 14:59:06 2011 -0700" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Mon May 23 16:53:16 2011 -0700" }, "message": "DO NOT MERGE. Preference activity changes to work on smaller tablet screens.\n\nBreadcrumbs move to the action bar on certain configs.\n\nPadding around fragments and to the left of preference items\nadjusted for different display sizes.\n\nChange-Id: Ie899f9742f4ebd7044f158b1c7db06df82ad2d75\n" }, { "commit": "82de141db736b95b0e388ff060e2d2535192d769", "tree": "556dd3944e7cf2254d5e0cc539cd71c9ff68fc9b", "parents": [ "4bb78889d04594c01a6af7f6d38c1764e9f575f9", "4a74eb679917797bf77a20773e0c079f5cc808e4" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon May 23 16:50:23 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 16:50:23 2011 -0700" }, "message": "am 4a74eb67: Merge \"DO NOT MERGE Use previous version if version is a codename\" into honeycomb-mr2\n\n* commit \u00274a74eb679917797bf77a20773e0c079f5cc808e4\u0027:\n DO NOT MERGE Use previous version if version is a codename\n" }, { "commit": "4a74eb679917797bf77a20773e0c079f5cc808e4", "tree": "e27c47c8ec91be46456a94696c34dab73de6810d", "parents": [ "40277df7c33c0fc381eec589c768fe86de4b4404", "3e1aecea2e1885eef9248906be4acc8ddb26607d" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon May 23 16:47:32 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 16:47:32 2011 -0700" }, "message": "Merge \"DO NOT MERGE Use previous version if version is a codename\" into honeycomb-mr2" }, { "commit": "bbca81334e3603c7328dc526bd63032b23d5261d", "tree": "c29dd1ed7c2119cd50bbc4e56be9ee36d89891c7", "parents": [ "98a8231e838d7d624c5862d81d1975ef4f8d0d57", "4bb78889d04594c01a6af7f6d38c1764e9f575f9" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 23 16:16:54 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 16:16:54 2011 -0700" }, "message": "am 4bb78889: am 40277df7: Merge \"Add \"television\" mode.\" into honeycomb-mr2\n\n* commit \u00274bb78889d04594c01a6af7f6d38c1764e9f575f9\u0027:\n Add \"television\" mode.\n" }, { "commit": "4bb78889d04594c01a6af7f6d38c1764e9f575f9", "tree": "4c9a9c2907d9edb89752f234cb00648e775f99f3", "parents": [ "070eecef394175d7344cdadde675e8977a1609f0", "40277df7c33c0fc381eec589c768fe86de4b4404" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 23 16:07:43 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 16:07:43 2011 -0700" }, "message": "am 40277df7: Merge \"Add \"television\" mode.\" into honeycomb-mr2\n\n* commit \u002740277df7c33c0fc381eec589c768fe86de4b4404\u0027:\n Add \"television\" mode.\n" }, { "commit": "3e1aecea2e1885eef9248906be4acc8ddb26607d", "tree": "13ee33be75516d8b08f8b498133ee13f434965e8", "parents": [ "14e45f9b19a846af074d73b3792e35de0448ac21" ], "author": { "name": "John Reck", "email": "jreck@google.com", "time": "Thu Apr 28 10:27:40 2011 -0700" }, "committer": { "name": "John Reck", "email": "jreck@google.com", "time": "Mon May 23 15:45:16 2011 -0700" }, "message": "DO NOT MERGE Use previous version if version is a codename\n\n When the version is reported as a codename, use the previous version\n in the user agent string.\n Bug: 4347787\n\nChange-Id: I4ed804a7334d6ca242446176ff042c4ac7938a0f\n" }, { "commit": "40277df7c33c0fc381eec589c768fe86de4b4404", "tree": "23d1d89d58e7b6edd43f837ed27fb01108f4fb08", "parents": [ "358d2cd96403383cfb91bb68598a4cb2fe2e170e", "e360bb6bd8ea84b8d37604fc11dfc744b18fb0de" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 23 15:18:20 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 15:18:20 2011 -0700" }, "message": "Merge \"Add \"television\" mode.\" into honeycomb-mr2" }, { "commit": "e360bb6bd8ea84b8d37604fc11dfc744b18fb0de", "tree": "7e833a630e8108be1345d8595438eea5a30e7173", "parents": [ "1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri May 20 16:11:04 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 23 15:11:08 2011 -0700" }, "message": "Add \"television\" mode.\n\nChange-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b\n" }, { "commit": "98a8231e838d7d624c5862d81d1975ef4f8d0d57", "tree": "e85a69162c52228c5d084f18429dd3b8a2888a81", "parents": [ "9a8ea20d4b3975d3f771364fb9f2272c32f8cad1", "59c87cb6074fe48dc0af20ef0082bdef0803dc45" ], "author": { "name": "TK MUN", "email": "tk.mun@samsung.com", "time": "Mon May 23 14:52:29 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 14:52:29 2011 -0700" }, "message": "am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received\n\n* commit \u002759c87cb6074fe48dc0af20ef0082bdef0803dc45\u0027:\n DO NOT MERGE SystemUI: update signal level when broadcast is received\n" }, { "commit": "59c87cb6074fe48dc0af20ef0082bdef0803dc45", "tree": "d13b8bebe4051a27c5039f1ced62dabf8d879188", "parents": [ "5b9ec6871afaf40325abe602cd1d29ddbd88cbb9", "6f0394a3b4d6082c9cb01de4a220a3b082e1840a" ], "author": { "name": "TK MUN", "email": "tk.mun@samsung.com", "time": "Mon May 23 14:47:38 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 14:47:38 2011 -0700" }, "message": "am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received\n\n* commit \u00276f0394a3b4d6082c9cb01de4a220a3b082e1840a\u0027:\n DO NOT MERGE SystemUI: update signal level when broadcast is received\n" }, { "commit": "560e97f8e0cb63a0fa6e88db6badc142a99517d2", "tree": "e08fd821c1fa45b4ae5d83ff490fe752626228a1", "parents": [ "f4232e0097ffb672f5d1559b20c7230081efe34f", "08d584cd1cba05284ccd2d0ea128c297624f0c47" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Mon May 23 14:34:00 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 14:34:00 2011 -0700" }, "message": "Merge \"Log a StrictMode violation when WebView methods are called on the wrong thread\"" }, { "commit": "939461300a0283a9f370a0425d4061d32b36f952", "tree": "41e7c361f261448cb511fa97324b7648a4fe8cc2", "parents": [ "bdd8a16282cf85bfdbe4c15adcd5c37db772de11", "070a19e035cd28f2a0cc831f2322f2121d80de44" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 23 14:08:12 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 23 14:10:26 2011 -0700" }, "message": "resolved conflicts for merge of 070a19e0 to master\n\nChange-Id: I855ab02a4e8dd465af67fd23b66c0dace76bd411\n" }, { "commit": "9a8ea20d4b3975d3f771364fb9f2272c32f8cad1", "tree": "e85a69162c52228c5d084f18429dd3b8a2888a81", "parents": [ "b1817383050986413805fbbf2c1cc5c03417574d", "070eecef394175d7344cdadde675e8977a1609f0" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 13:42:14 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 13:42:14 2011 -0700" }, "message": "am 070eecef: Merge \"Map multiple apnType to one DataConnection fixes.\" into honeycomb-LTE\n\n* commit \u0027070eecef394175d7344cdadde675e8977a1609f0\u0027:\n Map multiple apnType to one DataConnection fixes.\n" }, { "commit": "b1817383050986413805fbbf2c1cc5c03417574d", "tree": "47ff135a71ec320d75c9c8f87f8126f8362d7769", "parents": [ "f55a00b1b86c58d78a4c2812d00e1b61d03f520a", "d3924fe9f6c99bc92ed86195e07ba82d39043812" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 13:42:11 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 13:42:11 2011 -0700" }, "message": "am d3924fe9: Merge \"Data Connection: Use Alarm for all delayed data retries.\" into honeycomb-LTE\n\n* commit \u0027d3924fe9f6c99bc92ed86195e07ba82d39043812\u0027:\n Data Connection: Use Alarm for all delayed data retries.\n" }, { "commit": "070eecef394175d7344cdadde675e8977a1609f0", "tree": "80ffbbe7d57f11f7a55445423380512eb41c554e", "parents": [ "d3924fe9f6c99bc92ed86195e07ba82d39043812", "a95bce0b29dd629b512b5e5aec8ece35f12be049" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 13:39:03 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 13:39:03 2011 -0700" }, "message": "Merge \"Map multiple apnType to one DataConnection fixes.\" into honeycomb-LTE" }, { "commit": "d3924fe9f6c99bc92ed86195e07ba82d39043812", "tree": "9e917637a9fba1b74baf15dc265fb9c386635470", "parents": [ "de60ce66c117ebd224b9d3181e2184ec5cfe87f9", "a88d76b7721d3a4e0be33fe990ba2d900f923241" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 13:38:36 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 13:38:36 2011 -0700" }, "message": "Merge \"Data Connection: Use Alarm for all delayed data retries.\" into honeycomb-LTE" }, { "commit": "f4232e0097ffb672f5d1559b20c7230081efe34f", "tree": "f83c2f405f48494392726b48dfafbc9f74b8b831", "parents": [ "bdd8a16282cf85bfdbe4c15adcd5c37db772de11" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon May 23 12:43:29 2011 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Mon May 23 13:35:25 2011 -0700" }, "message": "Change action button layout for split action bars\n\nChange-Id: Ie1427ae6b0334bf0a8afd5cae968c286c82a3837\n" }, { "commit": "6f0394a3b4d6082c9cb01de4a220a3b082e1840a", "tree": "1db6805efcbb480cba79b14264564af40f8168e6", "parents": [ "4c1e73b69a13a4f24a8fc123f599a9e9d8505525" ], "author": { "name": "TK MUN", "email": "tk.mun@samsung.com", "time": "Tue May 17 14:48:42 2011 +0900" }, "committer": { "name": "Simon Wilson", "email": "simonwilson@google.com", "time": "Mon May 23 13:12:55 2011 -0700" }, "message": "DO NOT MERGE SystemUI: update signal level when broadcast is received\n\n- Signal level updates should be updated whenever a signal change\nbroadcast is received but it is failing to do so.\n- Only when state change broadcast is received, signal level was\nupdated. (Ex: State: Idle -\u003e State: Connected)\n\nChange-Id: I71d86782143b3440a042164a87af64c7bee97ae2\nSigned-off-by: TK MUN \u003ctk.mun@samsung.com\u003e\n" }, { "commit": "f55a00b1b86c58d78a4c2812d00e1b61d03f520a", "tree": "9b0f55fd04a2ede19b08fbcc37974032729dcfc7", "parents": [ "d5762583bd1eb37da6c09461e8b2453c83a600a6", "de60ce66c117ebd224b9d3181e2184ec5cfe87f9" ], "author": { "name": "Shimeng (Simon) Wang", "email": "swang@google.com", "time": "Mon May 23 12:55:37 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 12:55:37 2011 -0700" }, "message": "am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.\n\n* commit \u0027de60ce66c117ebd224b9d3181e2184ec5cfe87f9\u0027:\n Simplify browser pause/resume logic to avoid stuck timer.\n" }, { "commit": "de60ce66c117ebd224b9d3181e2184ec5cfe87f9", "tree": "4cc56f96642bafdd4afea4a8609f86ee038fb1a7", "parents": [ "ebae1923869ee71ab119f766ac01c5a320619290", "358d2cd96403383cfb91bb68598a4cb2fe2e170e" ], "author": { "name": "Shimeng (Simon) Wang", "email": "swang@google.com", "time": "Mon May 23 12:14:04 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 12:14:04 2011 -0700" }, "message": "am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.\n\n* commit \u0027358d2cd96403383cfb91bb68598a4cb2fe2e170e\u0027:\n Simplify browser pause/resume logic to avoid stuck timer.\n" }, { "commit": "a95bce0b29dd629b512b5e5aec8ece35f12be049", "tree": "104f413a796c2af2d764ba722905a03417bcae6f", "parents": [ "ebae1923869ee71ab119f766ac01c5a320619290" ], "author": { "name": "Ramesh Sudini", "email": "ramesh.sudini@motorola.com", "time": "Tue May 17 09:05:40 2011 -0500" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 12:01:40 2011 -0700" }, "message": "Map multiple apnType to one DataConnection fixes.\n\nWith current design the code maps to the same DC, but no indications go out.\nWith this, making it more async in nature that the request goes all the way\nto DC and all the data indications would be triggered by parallel paths through DCT.\n\nChange-Id: I4c6e64912dafe19154d910bbd0441b10ada36cff\n" }, { "commit": "a88d76b7721d3a4e0be33fe990ba2d900f923241", "tree": "b770b87a55204282aa76d0e802343e09d01aec4a", "parents": [ "ebae1923869ee71ab119f766ac01c5a320619290" ], "author": { "name": "Ramesh Sudini", "email": "ramesh.sudini@motorola.com", "time": "Sun May 22 09:24:28 2011 -0500" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Mon May 23 12:01:31 2011 -0700" }, "message": "Data Connection: Use Alarm for all delayed data retries.\n\nChange-Id: I5045c3a10808b75f1ca3174bd1c16f332d5f7fa8\n" }, { "commit": "d5762583bd1eb37da6c09461e8b2453c83a600a6", "tree": "c5f6734e29b09f3e813e83b926440376ba4dc1be", "parents": [ "46e802e9c12befcd477e59437c5de3f0889aef4e", "ebae1923869ee71ab119f766ac01c5a320619290" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon May 23 10:26:40 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 10:26:40 2011 -0700" }, "message": "am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().\n\n* commit \u0027ebae1923869ee71ab119f766ac01c5a320619290\u0027:\n Add some logging to track down where ANR happens during MediaPlayer._release().\n" }, { "commit": "46e802e9c12befcd477e59437c5de3f0889aef4e", "tree": "662e6a15ff9d526ed70163eee15d41cdd9360f45", "parents": [ "ea182704b60551a9bd7760aa9d206ca7a7e407b8", "5b9ec6871afaf40325abe602cd1d29ddbd88cbb9" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 10:22:00 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 10:22:00 2011 -0700" }, "message": "am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.\n\n* commit \u00275b9ec6871afaf40325abe602cd1d29ddbd88cbb9\u0027:\n Merge e57aa434 from honeycomb-mr1. do not merge.\n" }, { "commit": "ea182704b60551a9bd7760aa9d206ca7a7e407b8", "tree": "662e6a15ff9d526ed70163eee15d41cdd9360f45", "parents": [ "162dd490cd0b502c717db59300b3fd902f76710a", "041fd74beade4e95cff6157af9dadbf9a99b7fcf" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 10:21:57 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 10:21:57 2011 -0700" }, "message": "am 041fd74b: (-s ours) am f791863f: Merge \"Merge 05b7b69c from honeycomb-mr1. do not merge.\" into gingerbread\n\n* commit \u0027041fd74beade4e95cff6157af9dadbf9a99b7fcf\u0027:\n Merge 05b7b69c from honeycomb-mr1. do not merge.\n" }, { "commit": "162dd490cd0b502c717db59300b3fd902f76710a", "tree": "662e6a15ff9d526ed70163eee15d41cdd9360f45", "parents": [ "6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e", "9d9a7466cd051748ba656acd39265099294c4153" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 10:21:49 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 10:21:49 2011 -0700" }, "message": "am 9d9a7466: (-s ours) am bb43828a: Merge \"Merge 2fae858d from Honeycomb-mr1. do not merge.\" into gingerbread\n\n* commit \u00279d9a7466cd051748ba656acd39265099294c4153\u0027:\n Merge 2fae858d from Honeycomb-mr1. do not merge.\n" }, { "commit": "358d2cd96403383cfb91bb68598a4cb2fe2e170e", "tree": "d32fe41ebe50e8ecc9d8e45f660e8d7d3b36a5ed", "parents": [ "a5293d1ca4459293f4993ea39c09ea703a022844" ], "author": { "name": "Shimeng (Simon) Wang", "email": "swang@google.com", "time": "Mon May 23 09:33:31 2011 -0700" }, "committer": { "name": "Shimeng (Simon) Wang", "email": "swang@google.com", "time": "Mon May 23 10:00:39 2011 -0700" }, "message": "Simplify browser pause/resume logic to avoid stuck timer.\n\nThe current browser pause/resume logic uses an integer count to track\nthe pause/resume behavior, which is mostly working fine in phone. The interger\ncount is usually 0 when browser is paused, and its value is usually 1\nwhen the browser is resumed and will trigger any delayed timer.\n\nBut in tablet, where tabs can be easily created/switched/deleted, this\nlogic will not work well and sometimes cause resources timers get stuck.\nFor example, in case multiple tabs are created, and you reload one of the\ntabs, when it\u0027s almost finished, switch to another tab, and hit home or power\nbutton, at this point of time, the browser will be suspended at\nController.java::onPause, hence the integer count will be 0; but since\nthe other tab is also finished after the pause, the current logic at\nController.java::onPageFinished will call pause timer again, which will make\nthe integer count to be -1. Before the time the browser is resumed, it\u0027s very\npossible some tabs will have some resources, such as images/flashs,\nscheduled to be loaded, these will be in delayed timer in\nResourceLoadScheduler.cpp\u0027s m_requestTimer.\nNow when the browser is resumed, the integer count will be 0, which will not\ntrigger delayed timer. Then all the new timers will be stuck as well since\nold timers are not executed yet.\n\nThe fix is to simplify the pause/resume logic by just using a boolean variable\ninstead of error-prone integer counting.\n\nissue: 4177932\nChange-Id: Id10af9298c7be1f82222d0b94c34c5dc68403630\n" }, { "commit": "ebae1923869ee71ab119f766ac01c5a320619290", "tree": "637528747980b5dce8746105856ef7616efe1d4c", "parents": [ "f96a6150e4e6c37f8952456bf9f84714f622713d", "a5293d1ca4459293f4993ea39c09ea703a022844" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon May 23 09:59:59 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 09:59:59 2011 -0700" }, "message": "am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().\n\n* commit \u0027a5293d1ca4459293f4993ea39c09ea703a022844\u0027:\n Add some logging to track down where ANR happens during MediaPlayer._release().\n" }, { "commit": "5b9ec6871afaf40325abe602cd1d29ddbd88cbb9", "tree": "bf01111cc496cf7a819b903fb157dd5fdd6c1143", "parents": [ "041fd74beade4e95cff6157af9dadbf9a99b7fcf", "4c1e73b69a13a4f24a8fc123f599a9e9d8505525" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 09:52:55 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 09:52:55 2011 -0700" }, "message": "am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.\n\n* commit \u00274c1e73b69a13a4f24a8fc123f599a9e9d8505525\u0027:\n Merge e57aa434 from honeycomb-mr1. do not merge.\n" }, { "commit": "041fd74beade4e95cff6157af9dadbf9a99b7fcf", "tree": "859be7bdb276321a9bc76e04b82e98c984533f6f", "parents": [ "9d9a7466cd051748ba656acd39265099294c4153", "f791863f0ac67ab6abd7410d5807d716cffc5b72" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 09:52:52 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 09:52:52 2011 -0700" }, "message": "am f791863f: Merge \"Merge 05b7b69c from honeycomb-mr1. do not merge.\" into gingerbread\n\n* commit \u0027f791863f0ac67ab6abd7410d5807d716cffc5b72\u0027:\n Merge 05b7b69c from honeycomb-mr1. do not merge.\n" }, { "commit": "9d9a7466cd051748ba656acd39265099294c4153", "tree": "169fdf062bd009c1d46fab2492641681e481ef9f", "parents": [ "d1735ef91af201ff140f8d954dd07eff80836d20", "bb43828aa749e71d4e52ba69db01b83c83a755b5" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Mon May 23 09:52:41 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 09:52:41 2011 -0700" }, "message": "am bb43828a: Merge \"Merge 2fae858d from Honeycomb-mr1. do not merge.\" into gingerbread\n\n* commit \u0027bb43828aa749e71d4e52ba69db01b83c83a755b5\u0027:\n Merge 2fae858d from Honeycomb-mr1. do not merge.\n" }, { "commit": "a5293d1ca4459293f4993ea39c09ea703a022844", "tree": "5041c7da18d8d33fe6c1c711bde87fc3b9f2a473", "parents": [ "2c7906eb392c6349e6f75fd2681310b934d6e262" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 19 15:56:50 2011 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon May 23 09:36:31 2011 -0700" }, "message": "Add some logging to track down where ANR happens during MediaPlayer._release().\n\no add a log message in AwesomePlayer::reset before acquiring the lock\n\nChange-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb\nrelated-to-bug: 4409547\n" }, { "commit": "bdd8a16282cf85bfdbe4c15adcd5c37db772de11", "tree": "4571909fba4d95fab12f9e59d0adb44fcdb4c4c5", "parents": [ "8508485871dd22a998db98ea97403126918c5fa8", "f0e95696c03d9b2dca6a301a767071cf599a2845" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon May 23 09:06:03 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 09:06:03 2011 -0700" }, "message": "Merge \"HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead\"" }, { "commit": "08d584cd1cba05284ccd2d0ea128c297624f0c47", "tree": "1c1101362089634c01957c90378353bcb6829158", "parents": [ "43124d22142f708b39e79fb0d91258e6234b5f26" ], "author": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Tue May 17 19:05:03 2011 +0100" }, "committer": { "name": "Steve Block", "email": "steveblock@google.com", "time": "Mon May 23 14:45:02 2011 +0100" }, "message": "Log a StrictMode violation when WebView methods are called on the wrong thread\n\nBug: 4373919\nChange-Id: I1f526e033ce316e51b3de7fe4ac88119fbc65b4e\n" }, { "commit": "8508485871dd22a998db98ea97403126918c5fa8", "tree": "7888830d02350d6703d3046ea3a068f89ef7fa7c", "parents": [ "5710e72d91f16f34998ceccdd961ef9dc9e3cdb6", "5a6bec53e224b2db9ecbc6920faab08f4a962256" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Sat May 21 21:35:38 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 21 21:35:38 2011 -0700" }, "message": "am 5a6bec53: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp\n\n* commit \u00275a6bec53e224b2db9ecbc6920faab08f4a962256\u0027:\n Simplfy getActive* calls in ConnectivityService\n" }, { "commit": "5710e72d91f16f34998ceccdd961ef9dc9e3cdb6", "tree": "0165ced414287246286e518e93d365c8b0e30f2f", "parents": [ "35bfcbb9abdd61feb9cbfad0624680e594f0b772", "69ed0b628e18570f3fc7909fcdadc1e06f42e944" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumarg@android.com", "time": "Sat May 21 21:35:22 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 21 21:35:22 2011 -0700" }, "message": "am 69ed0b62: am d1735ef9: am 4b41df61: Merge \"Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.\"\n\n* commit \u002769ed0b628e18570f3fc7909fcdadc1e06f42e944\u0027:\n Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.\n" }, { "commit": "35bfcbb9abdd61feb9cbfad0624680e594f0b772", "tree": "cf556e7a8d586504248e541fbf93c0fb9ee3055d", "parents": [ "4cded6e5ead16b75b5785b50ff4090a6ea931ca5", "e2271a55ad67f766a6a47239d1a3f7319a1e7b2e" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumarg@android.com", "time": "Sat May 21 21:35:16 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 21 21:35:16 2011 -0700" }, "message": "am e2271a55: am d7030e55: am 198ed3e4: Merge \"BT: Wrong publishing result of bonding error code.\"\n\n* commit \u0027e2271a55ad67f766a6a47239d1a3f7319a1e7b2e\u0027:\n BT: Wrong publishing result of bonding error code.\n" }, { "commit": "4cded6e5ead16b75b5785b50ff4090a6ea931ca5", "tree": "7f700021a19db09b590cbc3e34e95fcb31d8407a", "parents": [ "736c987340d2e3d12f7b177be3692abf4abeebb6", "940138de9eae9be9ef60307af9e5f7a1168af533" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sat May 21 21:35:13 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 21 21:35:13 2011 -0700" }, "message": "am 940138de: am 0a734b18: am 14e45f9b: Merge \"Fix 4462497: Move layouts from xlarge to large to enable 7\" tablets\" into honeycomb-mr2\n\n* commit \u0027940138de9eae9be9ef60307af9e5f7a1168af533\u0027:\n Fix 4462497: Move layouts from xlarge to large to enable 7\" tablets\n" }, { "commit": "736c987340d2e3d12f7b177be3692abf4abeebb6", "tree": "2a42bf176955abbd78af472e94b5ebaeb6df38c4", "parents": [ "f746fc9e45c2bc80d8af2eb10d849c5807ebe1c7", "7d75e772cbfe3f28451981f3e6b4d10f6a5ddc05" ], "author": { "name": "Jim Miller", "email": "jaggies@google.com", "time": "Sat May 21 21:34:56 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 21 21:34:56 2011 -0700" }, "message": "am 7d75e772: am ef2b2669: am 5e731140: Merge \"Fix 4462474: Fixes crash on 7\" tablet due to using wrong resource\" into honeycomb-mr2\n\n* commit \u00277d75e772cbfe3f28451981f3e6b4d10f6a5ddc05\u0027:\n Fix 4462474: Fixes crash on 7\" tablet due to using wrong resource\n" }, { "commit": "eedcb9525ba5befee2ba6ebb7a9ee3f13395c2a3", "tree": "2753882abd3cd277dce4c30a1d6a59172f2c6f46", "parents": [ "850ae9acda0d062f9a1836d159bdce819e0f8066" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue May 17 14:55:15 2011 -0700" }, "committer": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Sat May 21 15:02:58 2011 -0700" }, "message": "APIs to profile network usage for current UID.\n\nAdded startDataProfiling() and stopDataProfiling() to TrafficStats,\nwhich can be used by apps to measure network usage delta between two\npoints in time. Currently takes two NetworkStats snapshots and returns\ndelta, which will eventually include tag-level granularity. Added\ntests for NetworkStats delta subtraction.\n\nAdded NMS.getNetworkStatsUidDetail() that returns stats for specific\nUID. Always gives stats access for the calling UID, otherwise enforces\nthat caller has permission. Fix readSingleLongFromFile(), since\n/proc/ files don\u0027t have well-defined lengths.\n\nChange-Id: Ic5b6414d8effbd66846e275b00d4b8a82c74589d\n" }, { "commit": "6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e", "tree": "662e6a15ff9d526ed70163eee15d41cdd9360f45", "parents": [ "8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e", "f96a6150e4e6c37f8952456bf9f84714f622713d" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Sat May 21 13:02:17 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 21 13:02:17 2011 -0700" }, "message": "am f96a6150: Data reconnection issue after airplane mode\n\n* commit \u0027f96a6150e4e6c37f8952456bf9f84714f622713d\u0027:\n Data reconnection issue after airplane mode\n" }, { "commit": "8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e", "tree": "f21155baebf2d98d59b7d6cb5021d962463a5f35", "parents": [ "7abbf93c854cd7d272183b674373e989a05da6dd", "4c88be655e387011c6d57c6d68b5deb94f6ce601" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Sat May 21 12:50:18 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 21 12:50:18 2011 -0700" }, "message": "am 4c88be65: GSM DCT: Update poll stats to support multi-links\n\n* commit \u00274c88be655e387011c6d57c6d68b5deb94f6ce601\u0027:\n GSM DCT: Update poll stats to support multi-links\n" }, { "commit": "f96a6150e4e6c37f8952456bf9f84714f622713d", "tree": "8eaf4b232dcfb30c3186b41ba865473701ec08f8", "parents": [ "4c88be655e387011c6d57c6d68b5deb94f6ce601" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Sat May 21 02:15:20 2011 -0500" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Sat May 21 12:49:41 2011 -0700" }, "message": "Data reconnection issue after airplane mode\n\nApnContext and DC were not disassociated when force\n\"cleanUpConnection\" was called. Causing the setup\nrequest was not happening if applyNewStatus() was\nthe trigger.\n\nChange-Id: I6d73a53edb72bb9ab4ebb92fffd06e6fe1f0c4aa\n" }, { "commit": "4c88be655e387011c6d57c6d68b5deb94f6ce601", "tree": "5d7c134e749b8c43d7318251274ca376c58a50c5", "parents": [ "15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Fri May 20 19:32:24 2011 -0500" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Sat May 21 11:57:41 2011 -0700" }, "message": "GSM DCT: Update poll stats to support multi-links\n\nChange-Id: I654e38e71f9576ed2c4da59af563be04bc87045c\n" }, { "commit": "7abbf93c854cd7d272183b674373e989a05da6dd", "tree": "b9882b7dc0bb448785877b7c1f971cd235171b16", "parents": [ "f7bc0e28bf66c20ef233a161cd1d50a009013ab0", "15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Sat May 21 11:13:07 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat May 21 11:13:07 2011 -0700" }, "message": "am 15cd6ec2: Tear down connection with unwanted linkproperty change\n\n* commit \u002715cd6ec250d22a093af3961ae1ec3cbbdd49d6b1\u0027:\n Tear down connection with unwanted linkproperty change\n" }, { "commit": "15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1", "tree": "bfe74132dcb77236d293228389afd5baaaee4c8b", "parents": [ "16e8d22b206fb0c8b8b5a243ea13e08597f60ebc" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Sat May 21 10:05:26 2011 -0700" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Sat May 21 10:05:26 2011 -0700" }, "message": "Tear down connection with unwanted linkproperty change\n\nMake sure to disconnect the link when RIL reported link property change\nwhich could cause connectivity issue. (i.e. IP address)\n\nChange-Id: I6601ef53e4561bdc7d2760d00e134b8431512cb2\n" }, { "commit": "f7bc0e28bf66c20ef233a161cd1d50a009013ab0", "tree": "7edcf4615dd05bb3493167fefc2b05b2ce4452eb", "parents": [ "f8d70b14e4285d17d83cc4853f50b44d6a55fbc7", "16e8d22b206fb0c8b8b5a243ea13e08597f60ebc" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 23:37:28 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 23:37:28 2011 -0700" }, "message": "am 16e8d22b: Fix build.\n\n* commit \u002716e8d22b206fb0c8b8b5a243ea13e08597f60ebc\u0027:\n Fix build.\n" }, { "commit": "16e8d22b206fb0c8b8b5a243ea13e08597f60ebc", "tree": "cd9a551759388c66d6e13083b50a6def3ae5fd0d", "parents": [ "5f353de96beca0a400796887e737314a62e35b6a" ], "author": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 23:31:29 2011 -0700" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Fri May 20 23:31:29 2011 -0700" }, "message": "Fix build.\n\nA merge accidentally included a line that was deleted.\n\nChange-Id: I991488ace290e5eb8eef3ca73f49c07d391028f5\n" } ], "next": "f746fc9e45c2bc80d8af2eb10d849c5807ebe1c7" }