)]}' { "log": [ { "commit": "9ff73de08f137ba03e18b8fd9fe0b070029c00f5", "tree": "eec8ba3644b7512155f92c5aa41861577faff95c", "parents": [ "c12b7ba81ec3b486f21394810d827258ba888ee4" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri May 27 16:23:58 2011 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri May 27 16:36:58 2011 -0700" }, "message": "Fix a few issues with sensors reference-counting\n" }, { "commit": "8c1132e3ceed8e1a8c696e2afe0e6fe456ccd7ef", "tree": "91476edcc4d1ce9b1a92acd45058a8ab33f1a1fb", "parents": [ "42c5a1666c4e576ccd5974233513100aad2c1534", "0601eb7953cbf77d92826bef3ca37e208d922de7" ], "author": { "name": "Daniel Sandler", "email": "dsandler@android.com", "time": "Thu May 26 06:01:41 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 26 06:01:41 2011 -0700" }, "message": "Merge \"Framework support for Android Dreams.\"" }, { "commit": "42c5a1666c4e576ccd5974233513100aad2c1534", "tree": "78d7835af04bef744259eb34ced43efef6b691e6", "parents": [ "2a3c67c0e99bd3d8c6c538ff323a27df19cad109" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Thu May 26 16:46:14 2011 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Thu May 26 19:21:35 2011 +0900" }, "message": "Fix internal variables and equals in SuggestionSpan\n\nBug: 4443922\n\n- Instantiating other package\u0027s class for the name is complicated, so we changed the internal value for the notification target class from Class to String.\n- Implement equals\n\nChange-Id: Iaf7682be777f0027d33c9a3be4609ac01b6950ad\n" }, { "commit": "2a3c67c0e99bd3d8c6c538ff323a27df19cad109", "tree": "6f05e3d75dd19952e7d7256309ff970c9ac2bb8d", "parents": [ "620d69d85b240a31ad1c41a23d28ea746e161ee3", "cfb046dead49568de6f6808a697e0508ef39a3a6" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Wed May 25 21:29:07 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 25 21:29:07 2011 -0700" }, "message": "am cfb046de: am 2c09a9c0: am 5520610c: Merge \"Make adb shell am display-size persistent.\" into honeycomb-mr2\n\n* commit \u0027cfb046dead49568de6f6808a697e0508ef39a3a6\u0027:\n Make adb shell am display-size persistent.\n" }, { "commit": "620d69d85b240a31ad1c41a23d28ea746e161ee3", "tree": "e8d0e41ca88d90155a250305c8146d8b83486524", "parents": [ "b3094dbe29deded7f503327087d10631669547e5", "103e74d9b1fdebbbc035da0567cd075554d4137d" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed May 25 21:28:39 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 25 21:28:39 2011 -0700" }, "message": "am 103e74d9: am d6f29cd8: am 2a15eb55: Merge \"Fix issue #4445007: DPM initializes some values to 1, instead of 0\" into honeycomb-mr2\n\n* commit \u0027103e74d9b1fdebbbc035da0567cd075554d4137d\u0027:\n Fix issue #4445007: DPM initializes some values to 1, instead of 0\n" }, { "commit": "f9f01008624e2d28c15a90d942fa36f98c8c967d", "tree": "3e6cfc7fc71c3cf7db7588713c7f0b9a64c1da81", "parents": [ "f30c23d7bfa7a490ce01e2799905f320883c66d3" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Thu May 19 21:31:50 2011 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Thu May 26 11:02:31 2011 +0900" }, "message": "Add Apis to send notifications when the suggestion was picked\n\n- Due to a strong request from VoiceIME\n\nBug: 4443922\n\nChange-Id: Ia539de0acf66053e0349daec459d75e36805f6bf\n" }, { "commit": "cfb046dead49568de6f6808a697e0508ef39a3a6", "tree": "591a065c04235d8dd913efefb3cd4a62bde21a37", "parents": [ "103e74d9b1fdebbbc035da0567cd075554d4137d", "2c09a9c0e960163a16ad1d06055aa6ee9635c693" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Wed May 25 11:46:28 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 25 11:46:28 2011 -0700" }, "message": "am 2c09a9c0: am 5520610c: Merge \"Make adb shell am display-size persistent.\" into honeycomb-mr2\n\n* commit \u00272c09a9c0e960163a16ad1d06055aa6ee9635c693\u0027:\n Make adb shell am display-size persistent.\n" }, { "commit": "2c09a9c0e960163a16ad1d06055aa6ee9635c693", "tree": "5fc6f6752a6295d6b4003114a0c3b86d6bdbaa8c", "parents": [ "d6f29cd8f92b098330818227428f5a42836097b7", "5520610cb2612054c5d0bcec9d031f7b71faa349" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Wed May 25 11:43:06 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 25 11:43:06 2011 -0700" }, "message": "am 5520610c: Merge \"Make adb shell am display-size persistent.\" into honeycomb-mr2\n\n* commit \u00275520610cb2612054c5d0bcec9d031f7b71faa349\u0027:\n Make adb shell am display-size persistent.\n" }, { "commit": "5520610cb2612054c5d0bcec9d031f7b71faa349", "tree": "ebaa618f61490fc160e6ac7b3631512b8a2dd9c7", "parents": [ "2a15eb559cfc18800b3e345995df76695a3ae4b2", "571ae90801d943a4c0c8897d1cf74c9cfe04b1ec" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Wed May 25 11:40:59 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 25 11:40:59 2011 -0700" }, "message": "Merge \"Make adb shell am display-size persistent.\" into honeycomb-mr2" }, { "commit": "571ae90801d943a4c0c8897d1cf74c9cfe04b1ec", "tree": "0fe9dfac6a14c64bf2aa9a19487a0d530197be2e", "parents": [ "ef89cc14957ab631346564801841190346632ac9" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue May 24 13:48:43 2011 -0700" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Wed May 25 11:40:21 2011 -0700" }, "message": "Make adb shell am display-size persistent.\n\nChange-Id: If3d5d18729f4e89eb7e689994deadd996fd487e9\n" }, { "commit": "103e74d9b1fdebbbc035da0567cd075554d4137d", "tree": "da4933eda163ccf5079408f7540f0d3ae099423f", "parents": [ "361c286d095a22152750e73b01bfc6b1d2076a4d", "d6f29cd8f92b098330818227428f5a42836097b7" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed May 25 11:18:59 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 25 11:18:59 2011 -0700" }, "message": "am d6f29cd8: am 2a15eb55: Merge \"Fix issue #4445007: DPM initializes some values to 1, instead of 0\" into honeycomb-mr2\n\n* commit \u0027d6f29cd8f92b098330818227428f5a42836097b7\u0027:\n Fix issue #4445007: DPM initializes some values to 1, instead of 0\n" }, { "commit": "d6f29cd8f92b098330818227428f5a42836097b7", "tree": "2a434ab3d3a25e08394370a26f2917dd9bea4a9c", "parents": [ "5d9e0a1a867aa5b6162a972288cbef41fd68a29b", "2a15eb559cfc18800b3e345995df76695a3ae4b2" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed May 25 11:14:13 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 25 11:14:13 2011 -0700" }, "message": "am 2a15eb55: Merge \"Fix issue #4445007: DPM initializes some values to 1, instead of 0\" into honeycomb-mr2\n\n* commit \u00272a15eb559cfc18800b3e345995df76695a3ae4b2\u0027:\n Fix issue #4445007: DPM initializes some values to 1, instead of 0\n" }, { "commit": "d998acb3491fe750ce157b6171d5b0a18f4b3883", "tree": "bcd5ea1329cd397a5bc8bd8689478b8679c6ae0d", "parents": [ "c404e9b20165f634904d1489216d17d8e09fe696" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed May 25 10:48:28 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed May 25 10:51:27 2011 -0700" }, "message": "Fix issue #4445007: DPM initializes some values to 1, instead of 0\n\nAlso fix not writing the settings file when an admin is removed.\n\nAnd take care of an old to-do about not removing an admin until\nafter it has received the broadcast about it being disabled.\n\nChange-Id: I4ebe0ea0461222b65425b2c5438b646b572f18c8\n" }, { "commit": "395d6a291d10994c7f7b13e9476b0f44e17e579e", "tree": "731d216bb7aae79fb54451eacd50f094b88457c4", "parents": [ "c1eb82373a89cff9ed04e581a8fb39eee1f739ab", "9f2106f2bcbb82cd2d8a80f24ab0cdafeb6b5d8f" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue May 24 14:42:18 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 24 14:42:18 2011 -0700" }, "message": "Merge \"Disable pointer debug logging.\"" }, { "commit": "9f2106f2bcbb82cd2d8a80f24ab0cdafeb6b5d8f", "tree": "c56c07e40287e938646796046515db1deab1a703", "parents": [ "80fd47ce75253dcdc2cfa85d7a3f42634b923a47" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue May 24 14:40:35 2011 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue May 24 14:40:35 2011 -0700" }, "message": "Disable pointer debug logging.\n\nChange-Id: I00628fa369cb1b179a1907f9cb19de8ca4c755ab\n" }, { "commit": "c1eb82373a89cff9ed04e581a8fb39eee1f739ab", "tree": "fb1c89338ae64b6946fe3f49d9b40fd6dba1ccca", "parents": [ "b5b1fb25853eb2e00f981d3b0bb52acd50684c4f", "80fd47ce75253dcdc2cfa85d7a3f42634b923a47" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue May 24 14:39:53 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 24 14:39:53 2011 -0700" }, "message": "Merge \"Input device protocol enhancements.\"" }, { "commit": "80fd47ce75253dcdc2cfa85d7a3f42634b923a47", "tree": "1edece586e3143d7f4e27e2f497f6d629365628a", "parents": [ "ebed7d6e35f7f960e6e6add2b8ab7c7a31a511c3" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue May 24 01:07:44 2011 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue May 24 14:39:19 2011 -0700" }, "message": "Input device protocol enhancements.\n\nAdded support for Linux multitouch protocol B (slots).\n\nAdded support for using the device\u0027s input properties as a hint\nto determine the intended usage of a touch device.\n\nAdded support for the ABS_MT_DISTANCE axis.\n\nFixed a bug reporting the presence of the orientation axis.\n\nChange-Id: Icf7b5a5a0f1a9cdf6ad2b35be8ea0c1a35815d48\n" }, { "commit": "b5b1fb25853eb2e00f981d3b0bb52acd50684c4f", "tree": "00f0ba0a582ea20541eb075827472d33231138ea", "parents": [ "e372c17ba76163018cbc1b6972c9e6b0a8a8b5f4", "ebed7d6e35f7f960e6e6add2b8ab7c7a31a511c3" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue May 24 14:26:18 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 24 14:26:18 2011 -0700" }, "message": "Merge \"Support wrapping app processes to inject debug instrumentation. Bug: 4437846\"" }, { "commit": "7cc9ee2676d3e892945d2096b18739802d5179e1", "tree": "50dd106df6162f8ff90c49e7e966f8047474a42a", "parents": [ "942bc252ce7dbd229e28ee3a44dc94e1dd0b0d90", "859443f2a4d6a2b72c3e9c75720d32d4e4c09489" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue May 24 12:57:17 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 24 12:57:17 2011 -0700" }, "message": "am 859443f2: am c0d9834a: am 5d78e0b8: Merge \"GPS: Change NTP polling interval from 4 to 24 hours\" into honeycomb-mr2\n\n* commit \u0027859443f2a4d6a2b72c3e9c75720d32d4e4c09489\u0027:\n GPS: Change NTP polling interval from 4 to 24 hours\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": "ebed7d6e35f7f960e6e6add2b8ab7c7a31a511c3", "tree": "ae346479a6c069a3a57acecb18a0b0a563325e3f", "parents": [ "cbc38e74f028d9e337eba0f3ed7c435310cc10c2" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Mon May 16 17:08:42 2011 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Tue May 24 12:01:25 2011 -0700" }, "message": "Support wrapping app processes to inject debug instrumentation.\nBug: 4437846\n\nChange-Id: I4552501c693716b14714afb5c5248edaca9547ab\n" }, { "commit": "0601eb7953cbf77d92826bef3ca37e208d922de7", "tree": "2c03cf6044b025e951648a6ea42577f3292e8f33", "parents": [ "52ee3eb4ebf108e593cc85b79d0aa1f651c69e35" ], "author": { "name": "Daniel Sandler", "email": "dsandler@android.com", "time": "Wed Apr 13 01:01:32 2011 -0400" }, "committer": { "name": "Daniel Sandler", "email": "dsandler@google.com", "time": "Tue May 24 10:28:52 2011 -0400" }, "message": "Framework support for Android Dreams.\n\nA Dream is an activity that is launched by the window\nmanager after a specified idle time. You might think of this\nas a \"screen saver\", but with the same capacity for\ninteractivity as any other application.\n\nThe window manager maintains a timer (like the screen lock\ntimer) that is reset on userActivity; the timer is suspended\nduring wakelocks and when the screen is off.\n\nWhen the timer elapses, the user\u0027s preferred dream module is\nlaunched (by reading Settings.Secure.DREAM_COMPONENT, which\nis configured through the Settings app UI).\n\nLike a dock app, the user can install new dreams and a\nsingle application package may contain multiple dream\nactivities. Unlike the dock mode, however, there is no\n\"screensaver mode\" for the system to manage. This allows us\nto offer the user the ability to run a dream at any time, in\naddition to making the overall mechanism quite simple.\n\nThere is no public API for this facility.\n\nThere is, however, a useful/recommended base class for dream\nactivities in the support library (change I4559a958).\n\nChange-Id: Ied691856f88cfa38a7aca496d015f9a595da72f2\n" }, { "commit": "859443f2a4d6a2b72c3e9c75720d32d4e4c09489", "tree": "a9b6b7d3d47430edbe56f6236388aa33ca0923c7", "parents": [ "fcdbcf9174f7a5404da4514b71041c3d37692d15", "c0d9834a1c6dd8d9cd0b7fe9b50495578c104405" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 23 18:45:17 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 18:45:17 2011 -0700" }, "message": "am c0d9834a: am 5d78e0b8: Merge \"GPS: Change NTP polling interval from 4 to 24 hours\" into honeycomb-mr2\n\n* commit \u0027c0d9834a1c6dd8d9cd0b7fe9b50495578c104405\u0027:\n GPS: Change NTP polling interval from 4 to 24 hours\n" }, { "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": "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": "c0d9834a1c6dd8d9cd0b7fe9b50495578c104405", "tree": "a4e9b92b9612141b9e518e01e08aeaa5a7780435", "parents": [ "5b00912e5844591a846e8ba3c4710d2daaa8069a", "5d78e0b8ea548da3fa88ae2190a9334297b992b6" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 23 18:04:44 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 23 18:04:44 2011 -0700" }, "message": "am 5d78e0b8: Merge \"GPS: Change NTP polling interval from 4 to 24 hours\" into honeycomb-mr2\n\n* commit \u00275d78e0b8ea548da3fa88ae2190a9334297b992b6\u0027:\n GPS: Change NTP polling interval from 4 to 24 hours\n" }, { "commit": "5d78e0b8ea548da3fa88ae2190a9334297b992b6", "tree": "bab3f5ce72e3bf4faf289fc5ff6cc0e85db2c703", "parents": [ "51652f5674e266d62607324255517d41d225d9be", "4c126068527c9adba45aa227d40e245ee8e7c9a4" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 23 18:01:50 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 23 18:01:50 2011 -0700" }, "message": "Merge \"GPS: Change NTP polling interval from 4 to 24 hours\" into honeycomb-mr2" }, { "commit": "4c126068527c9adba45aa227d40e245ee8e7c9a4", "tree": "0c776a2c2849aab68f70bd1c8369518debbea161", "parents": [ "b9537db8d9ee27efb4a98415ad2d6b50c1806e5d" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 23 20:57:43 2011 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 23 20:57:43 2011 -0400" }, "message": "GPS: Change NTP polling interval from 4 to 24 hours\n\n4 hours is excessive, and we want to save bandwidth on the NTP servers\n\nChange-Id: Ic5ac4f4a8e62167206f3f620ea51635a2ea771d6\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\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": "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": "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": "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": "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": "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": "5a6bec53e224b2db9ecbc6920faab08f4a962256", "tree": "141aa9cdb446d7826247d0182a8d371257c5343b", "parents": [ "69ed0b628e18570f3fc7909fcdadc1e06f42e944", "dec3dda8730c8d2bd6e45171bf2d83bf89d5d806" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri May 20 15:45:55 2011 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri May 20 15:45:55 2011 -0700" }, "message": "resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp\n\nChange-Id: If14c7fc51c4549524c2f39797a902093582bae6d\n" }, { "commit": "599115894f6f960a879d2e3036c547bbf4136020", "tree": "8c877dd193628f3ed2fa2f3a4452e58215947272", "parents": [ "dbfd055d51b51b7a6f412155c2391666efbb638a" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri May 20 12:23:41 2011 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Fri May 20 12:23:41 2011 -0700" }, "message": "Simplfy getActive* calls in ConnectivityService\n\nOne had been simplified on GB, but somehow it didn\u0027t make it here.\nbug: 4463770\n\nChange-Id: Ica51e836b1a7a489526a223168910b8e06c99c2b\n" }, { "commit": "33bdc3c9995cbef477cec756b65d767558e6b836", "tree": "647d850d1f2b703344661870c0a5ddd42e41e32c", "parents": [ "06a8ceacb0dc2713cb0bb2c93d2a750f2a58db68", "d9435bcecc820c8715d8b6b920fd43042418a1e9" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 06:51:14 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 06:51:14 2011 -0700" }, "message": "am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework\n\n* commit \u0027d9435bcecc820c8715d8b6b920fd43042418a1e9\u0027:\n Do not merge. Backport two fixes for InputMethethodFramework\n" }, { "commit": "d9435bcecc820c8715d8b6b920fd43042418a1e9", "tree": "0e1727820b6a6a4cfecfb9be26547dd08b8bb1f0", "parents": [ "c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a", "b4788fdbfdda97bd9cfd0e483276934114d9c438" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 06:41:03 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 20 06:41:03 2011 -0700" }, "message": "am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework\n\n* commit \u0027b4788fdbfdda97bd9cfd0e483276934114d9c438\u0027:\n Do not merge. Backport two fixes for InputMethethodFramework\n" }, { "commit": "208d5634047111811de16fb63c43d0bc8b4fe6de", "tree": "e306112c7842ea605a3b14ee0ecff74002ac0b5e", "parents": [ "4fc87d61c29886c848789208c9e32ba9ac4e5dd3" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 22:13:38 2011 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 22:13:38 2011 +0900" }, "message": "Fix a bug on SwitchToLastInputMethod\n\nChange-Id: Iab7531e7436375941ec3df4fba943af24e2f1231\n" }, { "commit": "b4788fdbfdda97bd9cfd0e483276934114d9c438", "tree": "b1551de9f7c570d15e716c2c64aeebbb8f5304f9", "parents": [ "69cb87576ba163b61bb0e6477a3b7c57a9b11d40" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 18:19:53 2011 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 22:11:54 2011 +0900" }, "message": "Do not merge. Backport two fixes for InputMethethodFramework\n\nBug: 3420384\n\nbackport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4\nbackport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942\n\nChange-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0\n" }, { "commit": "4fc87d61c29886c848789208c9e32ba9ac4e5dd3", "tree": "edf18d5cf98365555f7a9009242279f413bb61c1", "parents": [ "fef966ae4629f09158576de4cedef38e83d50b2b" ], "author": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 16:13:43 2011 +0900" }, "committer": { "name": "satok", "email": "satok@google.com", "time": "Fri May 20 18:03:37 2011 +0900" }, "message": "Fix switchToLastInputMethod to fall back into the applicable keyboard if there is no candidate ime\n\nChange-Id: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4\n" }, { "commit": "161e67ff3ba26408eea09221734ad2e29a1eed11", "tree": "6e98ff836fb5f134e01a7e9ef420ec35a78ad5d2", "parents": [ "9e735541beed238d3b99d4bd284af1fc953c3775", "06a8ceacb0dc2713cb0bb2c93d2a750f2a58db68" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu May 19 21:44:52 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu May 19 21:44:52 2011 -0700" }, "message": "resolved conflicts for merge of 06a8ceac to master\n\nChange-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69\n" }, { "commit": "9e735541beed238d3b99d4bd284af1fc953c3775", "tree": "daf976d790b1737e9d3e23b1cd69c7d18cdeeeec", "parents": [ "16fa5aae96ec7bb0ecf1578197b64d477bb6946e", "6960811d15eb66e8469330d3bc574c32c481db05" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu May 19 19:42:20 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 19 19:42:20 2011 -0700" }, "message": "Merge \"Fix a race that could cause GL commands to be executed from the wrong thread.\"" }, { "commit": "6960811d15eb66e8469330d3bc574c32c481db05", "tree": "54cacea2d152ffa2035a9753638994c0815e43cb", "parents": [ "6db8c505398a0979853f6c166e0a8bcafd9268f8" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu May 19 15:38:14 2011 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu May 19 19:40:02 2011 -0700" }, "message": "Fix a race that could cause GL commands to be executed from the wrong thread.\n\nChange-Id: Ia3d407f7bf2f5553f46cfdade70b7b0badb35beb\n" }, { "commit": "06a8ceacb0dc2713cb0bb2c93d2a750f2a58db68", "tree": "14cda7bbbdc5e6cabb492d7af1977a2f5548062b", "parents": [ "90177e59e5211dd9ab33761ce800e8a86a49d1e2", "c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu May 19 19:34:21 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 19 19:34:21 2011 -0700" }, "message": "am c851ea56: am 69cb8757: Add new \"-swNNNdp\" resource qualifier.\n\n* commit \u0027c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a\u0027:\n Add new \"-swNNNdp\" resource qualifier.\n" }, { "commit": "c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a", "tree": "c349206e8773ecdeb4cae8b537982b78e1c9d589", "parents": [ "d40575eb983eb7a1d383acc1f30f467374acd085", "69cb87576ba163b61bb0e6477a3b7c57a9b11d40" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu May 19 19:30:32 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 19 19:30:32 2011 -0700" }, "message": "am 69cb8757: Add new \"-swNNNdp\" resource qualifier.\n\n* commit \u002769cb87576ba163b61bb0e6477a3b7c57a9b11d40\u0027:\n Add new \"-swNNNdp\" resource qualifier.\n" }, { "commit": "e219b5452c20b069b25109a8bedca8d37ec3ccb6", "tree": "478f4895e13cd69df95e1800eb0fdc7ee756f951", "parents": [ "d36263fa3eb79bf9c28b457c9656af76d676fc2c", "91feae3c5994bd4768cea3507c62c65746adcfa6" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu May 19 18:29:45 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 19 18:29:45 2011 -0700" }, "message": "Merge \"TouchExplorer - refactoring and a couple of bug fixes\"" }, { "commit": "91feae3c5994bd4768cea3507c62c65746adcfa6", "tree": "40b703bb6be2b0169a8023428a89d900b790d63f", "parents": [ "191c1fbb7465dc6ba0cb2fa40c96b690ea73d68c" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu May 19 18:16:31 2011 -0700" }, "committer": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Thu May 19 18:29:01 2011 -0700" }, "message": "TouchExplorer - refactoring and a couple of bug fixes\n\n1. Refactored the code to avoid code duplication.\n\n2. Fixed a bug in removing unused pointers from the event.\n\n3. Fixed a bug that was crashing the explorer.\n\n4. Sending hover exit immediately at the end of touch exploration\n gesture rather with a delay.\n\nChange-Id: Ie288cb8090d6fb5e5c715afa6ea5660b17c019e0\n" }, { "commit": "69cb87576ba163b61bb0e6477a3b7c57a9b11d40", "tree": "a44be0af3d008409403be133358bdcd628741c01", "parents": [ "b9537db8d9ee27efb4a98415ad2d6b50c1806e5d" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu May 19 18:13:32 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu May 19 18:23:29 2011 -0700" }, "message": "Add new \"-swNNNdp\" resource qualifier.\n\nChange-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce\n" }, { "commit": "f74bf9a47df64d3c9cf32aa065f9bd53d37efdee", "tree": "abf36aacff98fa1999473b9171c3cedd37b94bee", "parents": [ "71fcc865e3ac3a3b05ffa204e6a2eaa8bad48a8c", "057f625cd9a1c0d1b1e7a5449fccd92de30c70ea" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu May 19 16:23:25 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 19 16:23:25 2011 -0700" }, "message": "Merge \"Fix a crasher in SensorService\"" }, { "commit": "057f625cd9a1c0d1b1e7a5449fccd92de30c70ea", "tree": "a24dc23d5fe062ad2bb186c93ccb0e07f54f8a60", "parents": [ "14a2935809e73a9d824888dc837f2f017100fd26" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu May 19 16:21:32 2011 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu May 19 16:21:32 2011 -0700" }, "message": "Fix a crasher in SensorService\n\nSensorService main thread wasn\u0027t java-enabled. however, in\nsome situations we end-up calling into the BatteryService from\nthat thread which causes a crash.\n\nChange-Id: Iffba90e4c4b743dba84d62f1342001a9db31916d\n" }, { "commit": "71fcc865e3ac3a3b05ffa204e6a2eaa8bad48a8c", "tree": "723e43edd52b5a1b800961bdeb4a3871001646df", "parents": [ "c23774baad014833f3e363fbad96588a39d5af18", "88b4f153e2be863d79f4d7f68af95e0f9375e4ec" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Thu May 19 16:16:43 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 19 16:16:43 2011 -0700" }, "message": "Merge \"Code cleanup.\"" }, { "commit": "88b4f153e2be863d79f4d7f68af95e0f9375e4ec", "tree": "217f76231d83005cdb38908888b76ebc50d18564", "parents": [ "51c07e717b4416dd338b0add3a3c94d1137366af" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Thu May 19 16:15:46 2011 -0700" }, "committer": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Thu May 19 16:15:46 2011 -0700" }, "message": "Code cleanup.\n\nChange-Id: Ia6ea04b83832db2f39e3168ef2596c24273a7ef3\n" }, { "commit": "e526cfb490a4c855d3b6c89096c9f606b02190f8", "tree": "8662c5c079dd1f19a7a54f57c3b236148b7d8dba", "parents": [ "ead8b50da67d2b61c4c887a7beec6d617f9e8950", "5b9ceebafd36db4491a49c1f00750ce50c4d4433" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Thu May 19 15:17:33 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 19 15:17:33 2011 -0700" }, "message": "am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge \"Move softap config handling to WifiConfigStore\" into honeycomb-mr2\n\n* commit \u00275b9ceebafd36db4491a49c1f00750ce50c4d4433\u0027:\n Move softap config handling to WifiConfigStore\n" }, { "commit": "a51b6fd6f8a53f040894ef07cf23695581595e6b", "tree": "b2e2b02e6a0568054fa279c54f50b7d2c80a9b18", "parents": [ "3a9e712aca65ac49e7155e98e5d6b815da76f94b", "b2d0ee164a1cf7bab31302c5d3cdd62322574271" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu May 19 15:02:18 2011 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu May 19 15:02:18 2011 -0700" }, "message": "resolved conflicts for merge of b2d0ee16 to master\n\nChange-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4\n" }, { "commit": "5b9ceebafd36db4491a49c1f00750ce50c4d4433", "tree": "f0c01a29cf0837009c5ba711618f8c0caf6e3015", "parents": [ "7189d571e2748972e1599ead3d503a9b185fdd3c", "a4815c0ec06c293ea9f50b2b925d5a98d11f1143" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Thu May 19 15:01:48 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 19 15:01:48 2011 -0700" }, "message": "am a4815c0e: am 9c9088a5: Merge \"Move softap config handling to WifiConfigStore\" into honeycomb-mr2\n\n* commit \u0027a4815c0ec06c293ea9f50b2b925d5a98d11f1143\u0027:\n Move softap config handling to WifiConfigStore\n" }, { "commit": "a4815c0ec06c293ea9f50b2b925d5a98d11f1143", "tree": "4d9fd7728d48b91cfb9c179c0d7d5ebd5e72710b", "parents": [ "f0c6ddd99b6770ee4de74ce42134f9f56b8ebc5d", "9c9088a54f6dee7a13dcc7a12297137147b01baa" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Thu May 19 14:57:54 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 19 14:57:54 2011 -0700" }, "message": "am 9c9088a5: Merge \"Move softap config handling to WifiConfigStore\" into honeycomb-mr2\n\n* commit \u00279c9088a54f6dee7a13dcc7a12297137147b01baa\u0027:\n Move softap config handling to WifiConfigStore\n" }, { "commit": "9c9088a54f6dee7a13dcc7a12297137147b01baa", "tree": "cf580fb197972caa21b762735904dbbe3d537dd2", "parents": [ "51fb97031f62b1181fc9eb6c636d09a68987d939", "ffcea7ae7316ab748a49f5e8f6c6798356f35719" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Thu May 19 14:54:25 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 19 14:54:25 2011 -0700" }, "message": "Merge \"Move softap config handling to WifiConfigStore\" into honeycomb-mr2" }, { "commit": "e6cd0c747e76723bc51a23925c239ae10f9d3b5c", "tree": "6fd4fa9f3e207f5a0aaf50edf972374196390a49", "parents": [ "0a36cec642fb58e295d0608026890d95d0ae3cc0", "2433c443bb5fe96d9a39b59e10e3c03d791e2278" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu May 19 12:48:14 2011 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu May 19 12:48:14 2011 -0700" }, "message": "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp\n\nChange-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1\n" }, { "commit": "2433c443bb5fe96d9a39b59e10e3c03d791e2278", "tree": "7feb2b64268b9b476e4fa5c91b19cdee3f86c117", "parents": [ "4b999030ad3e9f8d392d72c725134ec3fb6d2290", "f2006f3123dcdf598e052051041b49c89710b53e" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu May 19 11:04:01 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 19 11:04:01 2011 -0700" }, "message": "am f2006f31: Merge \"Break apart queries to getInstalled* API\" into gingerbread\n\n* commit \u0027f2006f3123dcdf598e052051041b49c89710b53e\u0027:\n Break apart queries to getInstalled* API\n" }, { "commit": "f2006f3123dcdf598e052051041b49c89710b53e", "tree": "ce65b17612c0044e23944d4cd6f2358a6587e2bf", "parents": [ "8dd85f80ba9c463f5616b47eceb620fe21203f4f", "0e2c0f37d98bb5539b0fe41865aaf1add0ff1bb3" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu May 19 10:55:00 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 19 10:55:00 2011 -0700" }, "message": "Merge \"Break apart queries to getInstalled* API\" into gingerbread" }, { "commit": "5c3816f2ff3d40136da1e40eec792d8faf0e75dd", "tree": "a1d92dd6bb6e5f0487beae8f3dffcdd8526d1d09", "parents": [ "c6b7a0131e92a0bdeb268cee185404ceae9b54b7", "c41aefe1d4c862a9fbaf717ffb886bbd702c94f2" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu May 19 07:54:53 2011 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu May 19 07:54:53 2011 -0700" }, "message": "Merge c41aefe1\n\nChange-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b\n" }, { "commit": "d37b84edf55e5c242de23f1e7dfc61cc150e7b54", "tree": "ced920943afde82e878daaa4c3acef896c22141f", "parents": [ "f74782f6a1b5c8e0529717260a714b4efe3a5c6c", "ba8fc5b059228402afa965e175d5f6655e3fe555" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu May 19 03:46:24 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 19 03:46:24 2011 -0700" }, "message": "am ba8fc5b0: am 8416e5cf: am 6ad07db7: Merge \"Fix fake display size when rotated.\" into honeycomb-mr2\n\n* commit \u0027ba8fc5b059228402afa965e175d5f6655e3fe555\u0027:\n Fix fake display size when rotated.\n" }, { "commit": "8904c3d814b5959b17a0523177f4142db6a18f1e", "tree": "5a5d1425d03eea440d18fb7d43a2d049842419da", "parents": [ "bf7e83689b290d3766effcb1a251e0dec1b672eb", "b22a9fd9bb32133cbc7dc4fc7752dbf68e52dffe" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Wed May 18 17:48:37 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 18 17:48:37 2011 -0700" }, "message": "am b22a9fd9: am 01758e81: Linkproperties update via unsol data call state change.\n\n* commit \u0027b22a9fd9bb32133cbc7dc4fc7752dbf68e52dffe\u0027:\n Linkproperties update via unsol data call state change.\n" }, { "commit": "c41aefe1d4c862a9fbaf717ffb886bbd702c94f2", "tree": "070fefdb7abe6bf474a3223b9a944b0423948855", "parents": [ "111d17ce5141aa0fa51de37deae0811e70555d34", "59b1a4ede7032c1b4d897e13dd4ede09b5e14743" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Wed May 18 16:33:16 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 18 16:33:16 2011 -0700" }, "message": "am 59b1a4ed: Switch to use netd to add/remove routes.\n\n* commit \u002759b1a4ede7032c1b4d897e13dd4ede09b5e14743\u0027:\n Switch to use netd to add/remove routes.\n" }, { "commit": "ffcea7ae7316ab748a49f5e8f6c6798356f35719", "tree": "dac580baab50caa3bc4612833c02dbf10ef06f21", "parents": [ "da4809455716cf16451ca5db79654370a6a44f17" ], "author": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Tue May 10 16:26:06 2011 -0700" }, "committer": { "name": "Irfan Sheriff", "email": "isheriff@google.com", "time": "Wed May 18 15:29:31 2011 -0700" }, "message": "Move softap config handling to WifiConfigStore\n\nMove softap config to flat file and read/write on a seperate handler thread\n\nBug: 4391796\n\nChange-Id: Iafe43200d7f829df7ced20a4e7b0ed451ad22a05\n" }, { "commit": "59b1a4ede7032c1b4d897e13dd4ede09b5e14743", "tree": "2dde7b9096bc3eea78f0895bf892d39888a89724", "parents": [ "8416e5cf0a8439a3f605629068d3639f2a35e08b" ], "author": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Tue May 10 15:05:02 2011 -0700" }, "committer": { "name": "Robert Greenwalt", "email": "rgreenwalt@google.com", "time": "Wed May 18 15:25:43 2011 -0700" }, "message": "Switch to use netd to add/remove routes.\n\nAlso adds support for v6 routes and for removing single routes.\n\nChange-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01\n" }, { "commit": "ba8fc5b059228402afa965e175d5f6655e3fe555", "tree": "042ef1982dcf1084634686f64d5b474a73d39b50", "parents": [ "a49b2dbdde52e20b6d590b35e209033229f5d82d", "8416e5cf0a8439a3f605629068d3639f2a35e08b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed May 18 15:16:05 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 18 15:16:05 2011 -0700" }, "message": "am 8416e5cf: am 6ad07db7: Merge \"Fix fake display size when rotated.\" into honeycomb-mr2\n\n* commit \u00278416e5cf0a8439a3f605629068d3639f2a35e08b\u0027:\n Fix fake display size when rotated.\n" }, { "commit": "8416e5cf0a8439a3f605629068d3639f2a35e08b", "tree": "b3ecbeb4adb1028250e2a0f38af9f3a5879c9086", "parents": [ "5a6c3d491ccac07ef3f6a624a8a3e0c36959b661", "6ad07db7a2c289d036f081eb0c7a666cdb77b548" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed May 18 15:12:07 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 18 15:12:07 2011 -0700" }, "message": "am 6ad07db7: Merge \"Fix fake display size when rotated.\" into honeycomb-mr2\n\n* commit \u00276ad07db7a2c289d036f081eb0c7a666cdb77b548\u0027:\n Fix fake display size when rotated.\n" }, { "commit": "8f7c271ac9daa35708246bf279f71db5ff103b58", "tree": "e8639805a5a8d532a879abb5565946cc80a9686f", "parents": [ "a429d5df1aa59d817d694b96a07351224cc5d146" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed May 18 15:07:48 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed May 18 15:07:48 2011 -0700" }, "message": "Fix fake display size when rotated.\n\nChange-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875\n" }, { "commit": "fb03c4fafee3a5bd6a26ec0b85162b45fd9dd57e", "tree": "38b7e71315b9a9985d4ac12b03cbef55a6944ba4", "parents": [ "2e6b4ad76c7b18d10aeffd19ecc743313eabbfaf", "4f9bb17f7e74746c4296100f2fbd47f0f6ead3a7" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed May 18 10:36:14 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 18 10:36:14 2011 -0700" }, "message": "am 4f9bb17f: am c2db2144: am a429d5df: Merge \"Improve compat mode scaling implementation.\" into honeycomb-mr2\n\n* commit \u00274f9bb17f7e74746c4296100f2fbd47f0f6ead3a7\u0027:\n Improve compat mode scaling implementation.\n" }, { "commit": "fa1e5561cc65b932067919fcd5d39fda7032793e", "tree": "1f43b6f81826db2989c8a24ddd653c0238f2b4aa", "parents": [ "74bafe40d766d3b9c90869b1d0bc7478d34015b4", "53b988ba1842f40e595bb85f2ca055c24787e6dc" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed May 18 09:23:35 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 18 09:23:35 2011 -0700" }, "message": "am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge \"StorageVolume: Add getStorageId() accessor\" into honeycomb-mr2\n\n* commit \u002753b988ba1842f40e595bb85f2ca055c24787e6dc\u0027:\n StorageVolume: Add getStorageId() accessor\n" }, { "commit": "b22a9fd9bb32133cbc7dc4fc7752dbf68e52dffe", "tree": "a509a5fc9f7e6263df7efe35b37a94465af8661f", "parents": [ "e34a7686a36bf0f48cd9d20090b4b8df1bf0d1ce", "01758e81b3ad89934581885bb2fc7006510ec639" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Wed May 18 00:02:31 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 18 00:02:31 2011 -0700" }, "message": "am 01758e81: Linkproperties update via unsol data call state change.\n\n* commit \u002701758e81b3ad89934581885bb2fc7006510ec639\u0027:\n Linkproperties update via unsol data call state change.\n" }, { "commit": "01758e81b3ad89934581885bb2fc7006510ec639", "tree": "4b8798302ff2ae67997509be1302c30e15fa1e4d", "parents": [ "258208a78ca90a7d3a45a2f15af4bbb21a266f47" ], "author": { "name": "Kazuhiro Ondo", "email": "kazuhiro.ondo@motorola.com", "time": "Sat Apr 30 20:10:57 2011 -0500" }, "committer": { "name": "Wink Saville", "email": "wink@google.com", "time": "Tue May 17 20:53:40 2011 -0700" }, "message": "Linkproperties update via unsol data call state change.\n\nHandles the scenario of radio technology handover with IP continuity.\nOnce RIL/Modem finished a handover operation, an unsol data call state\nchange will be send up to FW notifying all link propertes changes.\nFW will then re-configure the device with new link properties\nincluding iptable used by Tethering.\n\nChange-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12\n" }, { "commit": "4f9bb17f7e74746c4296100f2fbd47f0f6ead3a7", "tree": "111c425d5dd635e7ace6e644ca811133c110f346", "parents": [ "f61c3d077dbf804627e42f773dbbe51fcc3225ca", "c2db21445ddd4327e949b38edcf1ab9fd18f94f0" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue May 17 18:42:23 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 17 18:42:23 2011 -0700" }, "message": "am c2db2144: am a429d5df: Merge \"Improve compat mode scaling implementation.\" into honeycomb-mr2\n\n* commit \u0027c2db21445ddd4327e949b38edcf1ab9fd18f94f0\u0027:\n Improve compat mode scaling implementation.\n" }, { "commit": "c2db21445ddd4327e949b38edcf1ab9fd18f94f0", "tree": "c3438df93a42063a602547e787dd476d2316da63", "parents": [ "16c692229d6ed3d0df8682884b35252ea72c7c26", "a429d5df1aa59d817d694b96a07351224cc5d146" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue May 17 18:40:12 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 17 18:40:12 2011 -0700" }, "message": "am a429d5df: Merge \"Improve compat mode scaling implementation.\" into honeycomb-mr2\n\n* commit \u0027a429d5df1aa59d817d694b96a07351224cc5d146\u0027:\n Improve compat mode scaling implementation.\n" }, { "commit": "a429d5df1aa59d817d694b96a07351224cc5d146", "tree": "e792d8fff39091c4459d88d916cbeca136441eb9", "parents": [ "185d9c4dbf4b0ee976e4d0c3ea9d3ba307491339", "ffb3d939cc78cae523f14a0f8ab37061b5bffc20" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue May 17 18:38:37 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 17 18:38:37 2011 -0700" }, "message": "Merge \"Improve compat mode scaling implementation.\" into honeycomb-mr2" }, { "commit": "ffb3d939cc78cae523f14a0f8ab37061b5bffc20", "tree": "d0a6a4d7769e4dcaab3f4971fc9ab45265585da5", "parents": [ "7916ac65dc492e4e1431879875c77d7121fbf82e" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue May 17 17:44:51 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Tue May 17 18:29:51 2011 -0700" }, "message": "Improve compat mode scaling implementation.\n\nRip out the old funky code for trying to restrict the app window\nsizes to be within the compat mode range. Instead, we know rely\nentirely on scaling -- we deal with windows always with the scaling\napplied so that the window manager doesn\u0027t have to deal with them\nspecially. Instead, we just apply the inverse scale at the few\npoints we need to do something the app sees.\n\nChange-Id: I785409dd4513b5f738684e1635dc8f770c249651\n" }, { "commit": "53b988ba1842f40e595bb85f2ca055c24787e6dc", "tree": "d0cf7b4876717d179174843465f31355b3ac6923", "parents": [ "c54d3a987235c615715e45f5a22ba75e6fae22b3", "5a79cfd7518defdce1911cecbc2441bb0a057e54" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue May 17 16:49:40 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 17 16:49:40 2011 -0700" }, "message": "am 5a79cfd7: am 27ac64ec: Merge \"StorageVolume: Add getStorageId() accessor\" into honeycomb-mr2\n\n* commit \u00275a79cfd7518defdce1911cecbc2441bb0a057e54\u0027:\n StorageVolume: Add getStorageId() accessor\n" }, { "commit": "5a79cfd7518defdce1911cecbc2441bb0a057e54", "tree": "07128f1af400dbf8e1c102b0cba77f47885bd587", "parents": [ "1818b4a99016486d42de1a2ff35c88bb3197cd20", "27ac64eceee8d4e392983861c6bc6bd620e4c6f7" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue May 17 16:44:51 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 17 16:44:51 2011 -0700" }, "message": "am 27ac64ec: Merge \"StorageVolume: Add getStorageId() accessor\" into honeycomb-mr2\n\n* commit \u002727ac64eceee8d4e392983861c6bc6bd620e4c6f7\u0027:\n StorageVolume: Add getStorageId() accessor\n" }, { "commit": "433060a152aa4158f8a2082873b89004d673f240", "tree": "645c649e2ced1b7dc4c965bc696a0db2adc348ec", "parents": [ "71f017e0b0b6d712e46ee355a7c7bf9d8b8f72f5", "e69b2634d2486d8ee98727bdda105e1cd39623b8" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Tue May 17 15:13:35 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 17 15:13:35 2011 -0700" }, "message": "Merge \"SurfaceFlinger: unfreeze windows for fixed size buffers.\"" }, { "commit": "fbfe55512596fd00c1fb51caa851e17dae60fd43", "tree": "3b56e07920defa86686c909c2431396983ceef42", "parents": [ "50b27631598d56cf2def58270ddcf1619045dda4" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue May 17 17:19:37 2011 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Tue May 17 17:19:37 2011 -0400" }, "message": "StorageVolume: Add getStorageId() accessor\n\nThis ID is used for MTP as well as per volume querying in the media provider.\n\nChange-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "78ae81efa9d49b2697629f576e9f4beec6ec8b2b", "tree": "7f0200ec9067f8c1920fb6cb411913f4143cceb4", "parents": [ "38442b6884fe7b6289d688b64a3c410dd3c0ac18", "d5cdd597b895a48ffa9a8e39f8a2504cd9b905c4" ], "author": { "name": "Jeff Sharkey", "email": "jsharkey@android.com", "time": "Tue May 17 12:27:01 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue May 17 12:27:01 2011 -0700" }, "message": "Merge \"First pass at NetworkPolicy and activity tracking.\"" }, { "commit": "9d31154d0b0ecbc5a36733ac3a8b70dcae18bf9c", "tree": "21da3d76fd4b3e8d65228155844ee138f28e3f2c", "parents": [ "14a2935809e73a9d824888dc837f2f017100fd26", "b68c768ddb57407bc253230c677056329c9e4bae" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 21:39:47 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 16 21:39:47 2011 -0700" }, "message": "am b68c768d: am 41744836: am 7916ac65: Add new command line option to change global screen size.\n\n* commit \u0027b68c768ddb57407bc253230c677056329c9e4bae\u0027:\n Add new command line option to change global screen size.\n" }, { "commit": "b68c768ddb57407bc253230c677056329c9e4bae", "tree": "5b7a3f91318ede70711c656aa008feaab06121fc", "parents": [ "360f553311ab697995d24c2a42e45659a5436efa", "417448369c170a34d76c477aa19c5293e3caa1df" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 21:29:32 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 16 21:29:32 2011 -0700" }, "message": "am 41744836: am 7916ac65: Add new command line option to change global screen size.\n\n* commit \u0027417448369c170a34d76c477aa19c5293e3caa1df\u0027:\n Add new command line option to change global screen size.\n" }, { "commit": "417448369c170a34d76c477aa19c5293e3caa1df", "tree": "a19b5658af4abd13b8c132102898ab1b32669bb8", "parents": [ "7b0339a8adca1347fe7ac3ac118c903ff32442a8", "7916ac65dc492e4e1431879875c77d7121fbf82e" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 21:21:24 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 16 21:21:24 2011 -0700" }, "message": "am 7916ac65: Add new command line option to change global screen size.\n\n* commit \u00277916ac65dc492e4e1431879875c77d7121fbf82e\u0027:\n Add new command line option to change global screen size.\n" }, { "commit": "7916ac65dc492e4e1431879875c77d7121fbf82e", "tree": "a673e4cc163ea0e1d27d5a38fd2d37003812e37d", "parents": [ "8f3dbe1c377e64584c3ec10edf664fb278648109" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 20:45:48 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 20:55:41 2011 -0700" }, "message": "Add new command line option to change global screen size.\n\nFor example:\n\nadb shell am display-size 1024x600\n\nChange-Id: I5df462acd3323bdaaaefa3126faea7dd8595b726\n" }, { "commit": "e69b2634d2486d8ee98727bdda105e1cd39623b8", "tree": "dec8bb061a140a545f75816b29cb8590f044c034", "parents": [ "8318561e9a69f692531647fe28deecfee303a1dc" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Mon May 16 16:55:03 2011 -0700" }, "committer": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Mon May 16 16:59:04 2011 -0700" }, "message": "SurfaceFlinger: unfreeze windows for fixed size buffers.\n\nThis change makes SurfaceFlinger unfreeze a window if it ever gets a\nbuffer that is fixed-size. Normally the window would not be frozen if\nits in fixed-size mode, but if the window was frozen before entering\nfixed-size mode then it should be unfrozen.\n\nChange-Id: I6bc822d4b02ae51fa8914c1f60f5d24b2002b38d\n" }, { "commit": "60e13114eb806d50b7b362d39051c5c775704bf6", "tree": "7b53d402077177542434782d16e7e568399fad3f", "parents": [ "63446167b9d6d9ed3410320d17e8fe816caf6c42", "1d340a3c24913d8750900355cd92ef5742eea11f" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 13:16:45 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 16 13:16:45 2011 -0700" }, "message": "am 1d340a3c: am 0eac0927: Merge \"DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.\" into honeycomb-mr2\n\n* commit \u00271d340a3c24913d8750900355cd92ef5742eea11f\u0027:\n DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.\n" }, { "commit": "1d340a3c24913d8750900355cd92ef5742eea11f", "tree": "ce6e874eaed057c04946adfb3b67fa99bcb5db73", "parents": [ "fddd927fb78bb206287203f4f447a416b525115a", "0eac092766d7871b34927442ee0b6e27e7e1317b" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 13:13:00 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 16 13:13:00 2011 -0700" }, "message": "am 0eac0927: Merge \"DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.\" into honeycomb-mr2\n\n* commit \u00270eac092766d7871b34927442ee0b6e27e7e1317b\u0027:\n DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.\n" }, { "commit": "0eac092766d7871b34927442ee0b6e27e7e1317b", "tree": "b3b3e548c6d1c01a94cb929cde9442c6fc0698ab", "parents": [ "9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3", "68066c2f38e47b56f0510c56eafd827731a0dc08" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 13:10:23 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 16 13:10:23 2011 -0700" }, "message": "Merge \"DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.\" into honeycomb-mr2" }, { "commit": "68066c2f38e47b56f0510c56eafd827731a0dc08", "tree": "0c48dab5571260fcc03c864efbd4c638ad4d423e", "parents": [ "29735689cea7bf52998c1911542dcfdd1c1d9628" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Apr 21 17:26:39 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 13:08:07 2011 -0700" }, "message": "DO NOT MERGE. From main -- Start work on simulating landscape/portrait when orientation is locked.\n\nNot yet working, so turned off.\n\nAlso fix a bug where the display size configuration became inconsistent\nafter a configuration change -- we now figure out everything about the\ndisplay size when computing a new configuration.\n\nChange-Id: Id155f133c0bf108508a225ef64ed3ca398a90a58\n" }, { "commit": "63446167b9d6d9ed3410320d17e8fe816caf6c42", "tree": "527f5d02700b6a24520bff12acaf5dacded56d01", "parents": [ "f97ed771979162c4a2a75959c57fb793438a3a8b", "fddd927fb78bb206287203f4f447a416b525115a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 13:04:49 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 16 13:04:49 2011 -0700" }, "message": "am fddd927f: am 9d0f2c6d: Merge \"DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.\" into honeycomb-mr2\n\n* commit \u0027fddd927fb78bb206287203f4f447a416b525115a\u0027:\n DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.\n" }, { "commit": "fddd927fb78bb206287203f4f447a416b525115a", "tree": "20e3596bf3d2e2cdcea70b4d9c0ddab4d05cda92", "parents": [ "d90a2c4d4463085155444efb07eba2d6579b444a", "9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 13:02:57 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 16 13:02:57 2011 -0700" }, "message": "am 9d0f2c6d: Merge \"DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.\" into honeycomb-mr2\n\n* commit \u00279d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3\u0027:\n DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.\n" }, { "commit": "f97ed771979162c4a2a75959c57fb793438a3a8b", "tree": "7cfd542b6ab2730e26f3e4fee51548cf441af311", "parents": [ "b107f4dec334b4c54584d4af21a7ceefc14947f2", "d90a2c4d4463085155444efb07eba2d6579b444a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 13:01:38 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 16 13:01:38 2011 -0700" }, "message": "am d90a2c4d: am 1e662c32: Merge \"DO NOT MERGE. Integrate from master: Rework display size access.\" into honeycomb-mr2\n\n* commit \u0027d90a2c4d4463085155444efb07eba2d6579b444a\u0027:\n DO NOT MERGE. Integrate from master: Rework display size access.\n" }, { "commit": "9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3", "tree": "ea2228a72541ae74400c7b81226d9723a6e1cd9b", "parents": [ "1e662c3294b740ff694ad98e4d9a366e1e4b5e62", "29735689cea7bf52998c1911542dcfdd1c1d9628" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 13:01:07 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 16 13:01:07 2011 -0700" }, "message": "Merge \"DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.\" into honeycomb-mr2" }, { "commit": "29735689cea7bf52998c1911542dcfdd1c1d9628", "tree": "82fcde88be0860b040c0ce43deedbc61db5ce1a0", "parents": [ "ac8dea12c17aa047e03a358110aeb60401d36aa2" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Thu Apr 21 17:26:39 2011 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 12:57:38 2011 -0700" }, "message": "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.\n\nChange-Id: Ie271123271a662f3f753f381ce4c43ad7904dc4a\n" }, { "commit": "d90a2c4d4463085155444efb07eba2d6579b444a", "tree": "32467c0ecbd3648b4f393d2234b8ad686cf69a3f", "parents": [ "e23639e0386735df50ad208078f638c38f662d42", "1e662c3294b740ff694ad98e4d9a366e1e4b5e62" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 12:57:00 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 16 12:57:00 2011 -0700" }, "message": "am 1e662c32: Merge \"DO NOT MERGE. Integrate from master: Rework display size access.\" into honeycomb-mr2\n\n* commit \u00271e662c3294b740ff694ad98e4d9a366e1e4b5e62\u0027:\n DO NOT MERGE. Integrate from master: Rework display size access.\n" }, { "commit": "1e662c3294b740ff694ad98e4d9a366e1e4b5e62", "tree": "135d285dcb1f27f18a6267ebb481325d39899d00", "parents": [ "15afd076d6070374cbb4f9dcbe28dda67caa0718", "ac8dea12c17aa047e03a358110aeb60401d36aa2" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon May 16 12:54:22 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon May 16 12:54:22 2011 -0700" }, "message": "Merge \"DO NOT MERGE. Integrate from master: Rework display size access.\" into honeycomb-mr2" }, { "commit": "8fa5b03c1ba4253003c807ad753f58af17086b4e", "tree": "5418b798293df7e89e15bcdce80a95b8e0cc2529", "parents": [ "4cfa909c6d9aa83288dd39e571dc0b34d6b52381", "fc4a3d37ef044b35450800235195401c4a54c712" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 16 15:49:53 2011 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Mon May 16 15:49:53 2011 -0400" }, "message": "resolved conflicts for merge of fc4a3d37 to master\n\nChange-Id: I40f603ba9330c3e882f4d58398095f4094725b21\n" } ], "next": "fc4a3d37ef044b35450800235195401c4a54c712" }