)]}' { "log": [ { "commit": "b83cb7cda3947fb35e126eab1530732fcd797ad0", "tree": "52b08d627f2c28e0bacb4082d3d139ed4378041a", "parents": [ "5402590f1cb8ae1bc31f796705ff6f10bc175730" ], "author": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Tue Sep 14 13:36:01 2010 -0700" }, "committer": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Tue Sep 14 13:36:01 2010 -0700" }, "message": "revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5\n\ncan\u0027t change return type from void to int.\n\nChange-Id: Iec3d95c731f117aca20b29c719cef7bcc6356ac0\n" }, { "commit": "5402590f1cb8ae1bc31f796705ff6f10bc175730", "tree": "0f11fa9b63daa59bce97706f4939300a878dc8d0", "parents": [ "b729dcc8a94bc2c2a1ecda47d791be0d6f1d160a" ], "author": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Tue Sep 14 12:14:26 2010 -0700" }, "committer": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Tue Sep 14 12:14:26 2010 -0700" }, "message": "change return type from void to int on execSQL() methods\n\n1. let execSQL() methods return the number of rows affected by the SQL\nstaement executed.\n2. remove synchronized on 2 public methods. since public API is not\nsupposed to have synchronized, this was a mistake in previously submitted\nCL\n\nChange-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5\n" }, { "commit": "b729dcc8a94bc2c2a1ecda47d791be0d6f1d160a", "tree": "5e1bb9cea92af154255daf7f0d3fa9419c769d6f", "parents": [ "d3326231dc3d334054fbeeacdf691965d1618a0c" ], "author": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Tue Sep 14 11:35:49 2010 -0700" }, "committer": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Tue Sep 14 11:55:24 2010 -0700" }, "message": "Revert \"caching code retooled to reduce locking + handle SMP\"\n\nThis reverts commit 992f7d52fad590d90edc166cd74380e96d627605.\n\nChange-Id: Ia5b789d1b2195d6ce43baffe24296c857f9b30f6\n" }, { "commit": "9322775014432ed6c87c864e98fe482f879ff233", "tree": "b228ab2c68c7a8c2776cc11e3bcb8206593e4d1b", "parents": [ "023606abb6784ebc8e56bbff7e87ca695752cdde" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Sep 14 10:10:54 2010 -0700" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Tue Sep 14 10:55:10 2010 -0700" }, "message": "Add a missing setOnCloseListener and a new setIconfied method.\n\nKeep track of the currently iconified state as well, if the app\nwants to know.\n" }, { "commit": "a21e3da55940e239addd80bf379091a1d85d006f", "tree": "e3a34c539ef03235f8e5db63e28b1c35a3b872e0", "parents": [ "ade9916d5ca5795ced859a7d7405ef32140ccee8" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Sun Sep 12 19:27:46 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 13 22:49:54 2010 -0700" }, "message": "Fix issue #2967969: Crash rotating screen on \"delete account\" dialog\n\n- Have PreferenceActivity save and restore its header state.\n- Keep track of the current header selection.\n- When headers are updated, try to retain the current header selection.\n\nAlso fix issue #2995541: Cannot add new contact. We were not allowing\nfragment transactions in some cases.\n\nChange-Id: I4aa4c703ed5f4ecf9f425cd7eeea4740c6360ce9\n" }, { "commit": "e746f03c6c8b8d0897d322ab524d545ace200fcd", "tree": "c994b35c248fe2f75bbb4060b1441289a9cca292", "parents": [ "1510770165b7bc675e5171560e907c0269dbe0fa", "53686433a9790bcfe7211a661b26783ee12bb436" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 13 16:02:57 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 13 16:56:10 2010 -0700" }, "message": "resolved conflicts for merge of 53686433 to master\n\nChange-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d\n" }, { "commit": "992f7d52fad590d90edc166cd74380e96d627605", "tree": "1def4d235a915ce84057959cc42f32efbaa1da18", "parents": [ "f4cae9f944975f7232b565e78ba35e7515871aec" ], "author": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Thu Sep 02 23:22:49 2010 -0700" }, "committer": { "name": "Vasu Nori", "email": "vnori@google.com", "time": "Mon Sep 13 14:38:24 2010 -0700" }, "message": "caching code retooled to reduce locking + handle SMP\n\n1. Moved all code related to compiled-sql statement cache to SQLiteCache.java\nRemoved all caching related code from everywhere else.\n2. Moved all code related to compiling a sql statement and caching it to\nSQLiteCompiledSql.java. There was some code in SQLiteProgram.java\nreleated to this. moved it out.\n3. Added state to SQLiteCompiledSql. This is to help in debugging.\nChange-Id: I63ab0c9c4419e964eb9796d284dd389985763d83\n" }, { "commit": "53686433a9790bcfe7211a661b26783ee12bb436", "tree": "0efd0a78a1d51c2d1c2d75ecef8ab158029e68a3", "parents": [ "0522f5e9b7dac0dc0229c9ddb07e7e5482846b1a", "7e9f4eb2608148436cef36c9969bf8a599b39e72" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 13 14:34:22 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 13 14:34:22 2010 -0700" }, "message": "am 7e9f4eb2: Track client requests through location manager.\n\nMerge commit \u00277e9f4eb2608148436cef36c9969bf8a599b39e72\u0027 into gingerbread-plus-aosp\n\n* commit \u00277e9f4eb2608148436cef36c9969bf8a599b39e72\u0027:\n Track client requests through location manager.\n" }, { "commit": "7e9f4eb2608148436cef36c9969bf8a599b39e72", "tree": "16351bff3017f948792a6308f4f6698e0a9d769c", "parents": [ "cc5494c9996f809e36539b24e8b6b67683383d29" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 10 18:43:00 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Mon Sep 13 14:20:48 2010 -0700" }, "message": "Track client requests through location manager.\n\nThis fixes a problem where applications could ask the location\nmanager to do very heavy-weight things (like... say... update\nlocation every minute), which would get accounted against the\nsystem instead of the application because ultimately it is the\nsystem making the heavy calls (wake locks, etc).\n\nTo solve this, we introduce a new class WorkSource representing\nthe source of some work. Wake locks and Wifi locks allow you\nto set the source to use (but only if you are system code and thus\ncan get the permission to do so), which is what will be reported\nto the battery stats until the actual caller.\n\nFor the initial implementation, the location manager keeps track\nof all clients requesting periodic updates, and tells its providers\nabout them as a WorkSource param when setting their min update time.\nThe network location provider uses this to set the source on the\nwake and wifi locks it acquires, when doing work because of the\nupdate period.\n\nThis should also be used elsewhere, such as in the GPS provider,\nbut this is a good start.\n\nChange-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf\n" }, { "commit": "cec7eb1c079331ba38ed4472abe26a55d6427324", "tree": "30b683042ed7860d9b4185ec5c51be248a71eac8", "parents": [ "df10a19296b7c69b9bd314806d1de24ed698bc46", "8b11f30cb2cfe9922439e8a032311de114ce4da4" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Sun Sep 12 19:34:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Sep 12 19:34:30 2010 -0700" }, "message": "am 8b11f30c: am 1bece432: Make nativeLibraryDir visible in the API\n\nMerge commit \u00278b11f30cb2cfe9922439e8a032311de114ce4da4\u0027\n\n* commit \u00278b11f30cb2cfe9922439e8a032311de114ce4da4\u0027:\n Make nativeLibraryDir visible in the API\n" }, { "commit": "8b11f30cb2cfe9922439e8a032311de114ce4da4", "tree": "93b73984868ed2a584784710232e404323bc0f13", "parents": [ "f353daa03aeb3c04fdfa87b7bcd49f0a7eea59b1", "1bece4320c1d2308b4a5b5aeda47b065312b3053" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Sun Sep 12 19:31:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Sep 12 19:31:45 2010 -0700" }, "message": "am 1bece432: Make nativeLibraryDir visible in the API\n\nMerge commit \u00271bece4320c1d2308b4a5b5aeda47b065312b3053\u0027 into gingerbread-plus-aosp\n\n* commit \u00271bece4320c1d2308b4a5b5aeda47b065312b3053\u0027:\n Make nativeLibraryDir visible in the API\n" }, { "commit": "1bece4320c1d2308b4a5b5aeda47b065312b3053", "tree": "daf3d6876cd335a397835dc76b4efce191798a45", "parents": [ "90fb15a7e52b1208b8d4f7518a61efb99580b5b0" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Sun Sep 12 19:20:03 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Sun Sep 12 19:20:32 2010 -0700" }, "message": "Make nativeLibraryDir visible in the API\n\nChange-Id: Ic88e76a85b0041e97b4c29c42dfa09db0356391c\n" }, { "commit": "df10a19296b7c69b9bd314806d1de24ed698bc46", "tree": "98e4e2350aba0af29e07e4c33bf8e853b8cc24d2", "parents": [ "cf78b3e5101349fdddbde14b3a55140f9562ae66", "f353daa03aeb3c04fdfa87b7bcd49f0a7eea59b1" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Sun Sep 12 19:14:42 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Sep 12 19:14:42 2010 -0700" }, "message": "am f353daa0: am 90fb15a7: Support UI visibility and restarting in download manager.\n\nMerge commit \u0027f353daa03aeb3c04fdfa87b7bcd49f0a7eea59b1\u0027\n\n* commit \u0027f353daa03aeb3c04fdfa87b7bcd49f0a7eea59b1\u0027:\n Support UI visibility and restarting in download manager.\n" }, { "commit": "f353daa03aeb3c04fdfa87b7bcd49f0a7eea59b1", "tree": "c235d54ae944b5c597237808a21a7ed2fc4f5053", "parents": [ "40e3af61dcbf7e49979a67410f37c4b4523a0bd6", "90fb15a7e52b1208b8d4f7518a61efb99580b5b0" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Sun Sep 12 19:11:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Sep 12 19:11:08 2010 -0700" }, "message": "am 90fb15a7: Support UI visibility and restarting in download manager.\n\nMerge commit \u002790fb15a7e52b1208b8d4f7518a61efb99580b5b0\u0027 into gingerbread-plus-aosp\n\n* commit \u002790fb15a7e52b1208b8d4f7518a61efb99580b5b0\u0027:\n Support UI visibility and restarting in download manager.\n" }, { "commit": "90fb15a7e52b1208b8d4f7518a61efb99580b5b0", "tree": "5539ec7c687580e233402ccc505a17fd9970e2dc", "parents": [ "8abc9e9b9917760a63cc38a030e64f207aeef86d" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Thu Sep 09 16:13:41 2010 -0700" }, "committer": { "name": "Steve Howard", "email": "showard@google.com", "time": "Sun Sep 12 18:58:55 2010 -0700" }, "message": "Support UI visibility and restarting in download manager.\n\nFirst, this change adds a column to the downloads table specifying\nwhether a download should be displayed in the system downloads UI. It\nadds a public method to set this parameter when requesting a download,\nand a hidden method to filter queries based on this paramter (such\nfiltering could be made public later, but it\u0027s not strictly necessary\nright now).\n\nSecond, this change adds support for restarting a completed/failed\ndownload as a hidden method on DownloadManager. Currently it only\nworks from the download manager\u0027s process - it\u0027ll be used by the new\ndownload manager UI.\n\nChange-Id: I15eda1a6e3717d1ce947a810b25ad3540cce809e\n" }, { "commit": "cf78b3e5101349fdddbde14b3a55140f9562ae66", "tree": "972933c7645d7e4ab21f202e89e4f6d41d9b20f8", "parents": [ "8d20f6b8cb5023318a4f422778d1d4f845ac7fe4" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Sun Sep 12 18:25:23 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Sun Sep 12 18:33:44 2010 -0700" }, "message": "Add support for custom action views in ActionBar menus\n\nChange-Id: Ic7850bc00fcfe95d805dd6a1b15cb5d413942475\n" }, { "commit": "2bffd268f135df8308c9e67af110525a5c463424", "tree": "4af48402f57aeb87e7d9765c5b739825af3fcb70", "parents": [ "eb851c4ecf38e3e2935fcf81c75c2ceadc2728e1" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Sun Sep 12 17:40:02 2010 -0700" }, "committer": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Sun Sep 12 17:59:13 2010 -0700" }, "message": "Fix text rendering issue with text scaling.\n\nChange-Id: I1f3ae40025697e8f8ca0616ee6550fe215cadcc8\n" }, { "commit": "eb851c4ecf38e3e2935fcf81c75c2ceadc2728e1", "tree": "9a2a71b22e0283d4a19e8cb2b324c3ec141e51df", "parents": [ "b3787d57fffbb898f4767f7a94031cafe974a0b0", "e740dd0c8fde910066f9ddf83b4ab094ed95eaf9" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Sep 12 17:24:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Sep 12 17:24:29 2010 -0700" }, "message": "am e740dd0c: am 69206512: Fix some API discrepancies in InputEvent.\n\nMerge commit \u0027e740dd0c8fde910066f9ddf83b4ab094ed95eaf9\u0027\n\n* commit \u0027e740dd0c8fde910066f9ddf83b4ab094ed95eaf9\u0027:\n Fix some API discrepancies in InputEvent.\n" }, { "commit": "e740dd0c8fde910066f9ddf83b4ab094ed95eaf9", "tree": "e8736121be38c634328789d669e27f4aabb618a2", "parents": [ "0f0541e40cfef51eb5c3769e53c1aa853b53aaf6", "692065128e66de77470de2c50ead2bef0452952a" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Sep 12 17:21:18 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Sep 12 17:21:18 2010 -0700" }, "message": "am 69206512: Fix some API discrepancies in InputEvent.\n\nMerge commit \u0027692065128e66de77470de2c50ead2bef0452952a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027692065128e66de77470de2c50ead2bef0452952a\u0027:\n Fix some API discrepancies in InputEvent.\n" }, { "commit": "692065128e66de77470de2c50ead2bef0452952a", "tree": "14544d3996555c184b9bfdad8a0f33ae68b93acf", "parents": [ "b88102f5b7e51552a3576cf197b4c8cf96f193d1" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Sep 12 17:17:30 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Sun Sep 12 17:17:30 2010 -0700" }, "message": "Fix some API discrepancies in InputEvent.\n\nChange-Id: I8e33e125e10075d6f256a1eb3dd46990f35074d6\n" }, { "commit": "2a5a53709ee40d4e400ef78adc695a1a9ae874e2", "tree": "538dc23081775b97c2461be394801e92bcd96385", "parents": [ "c7b29fbb3ea4601e8bfcf8d2ce13c3fbb390de82" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Sun Sep 12 15:51:13 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Sun Sep 12 15:51:18 2010 -0700" }, "message": "Fix broken ActionMode close button styling\n\nChange-Id: I425df1433d43c1b2bd392464ed10142532640f81\n" }, { "commit": "522632cde516001429549c60bd570c399ffad800", "tree": "6777277e2e606f9580282ac1ce0670bdf382e8c0", "parents": [ "5976d24d6fad2a0d97a7d9ad31f1ceac15a2ea94" ], "author": { "name": "Nipun Kwatra", "email": "nkwatra@google.com", "time": "Fri Sep 10 15:45:57 2010 -0700" }, "committer": { "name": "Nipun Kwatra", "email": "nkwatra@google.com", "time": "Fri Sep 10 18:01:46 2010 -0700" }, "message": "Exposing specific profile levels + hasProfile().\n\n- Exposing the specific resolution profile levels\n QUALITY_{QCIF,CIF,480P,720P,1080P} and the new time lapse profiles\n QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,CIF,480P,720P,1080P}\n- Unhiding the hasProfile() function used to test if a given profile exists.\n\nChange-Id: I5d8b9e1ba61718f304235e76d85244e428e68643\n" }, { "commit": "b20db3ec34e846010f389880b2cfab4d7bf79820", "tree": "e950687120910b002fde8e9ee67bdfeef5b2255b", "parents": [ "547705d3efd4c8500e0d4c136cacaeaa3f2df46e" ], "author": { "name": "Chet Haase", "email": "chet@google.com", "time": "Fri Sep 10 13:07:30 2010 -0700" }, "committer": { "name": "Chet Haase", "email": "chet@google.com", "time": "Fri Sep 10 17:43:04 2010 -0700" }, "message": "Make fragment animations work when fragments go away\n\nChange-Id: I136de6ef910cc02b8181fcfa065bdb0770841396\n" }, { "commit": "733cbd58cbc3cf438a7ac0a2902b8aeab941a6b9", "tree": "f96b0ea5c2ffc17ca8d337ede34415e76ce8cc22", "parents": [ "1acd5203263bd22b87869a7847752e817b940558" ], "author": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Fri Sep 03 12:21:39 2010 -0700" }, "committer": { "name": "Amith Yamasani", "email": "yamasani@google.com", "time": "Fri Sep 10 16:00:12 2010 -0700" }, "message": "SearchView API\n\nImplements the basic requirements for in-app search. More work to be done.\n" }, { "commit": "38f75b97d92508633c69eb6461efd353a61dab96", "tree": "03d8dae2b8894beae7b75033f5b34680080735ff", "parents": [ "e7be8e8f6c3db50df8e755033cd110aabd1143df", "58300000c1867eaf10fbfb91c53d1b86a37f5b47" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Fri Sep 10 14:03:28 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 10 14:03:28 2010 -0700" }, "message": "am 58300000: This was already deprecated, but not picked up by the tool DO NOT MERGE\n\nMerge commit \u002758300000c1867eaf10fbfb91c53d1b86a37f5b47\u0027 into gingerbread-plus-aosp\n\n* commit \u002758300000c1867eaf10fbfb91c53d1b86a37f5b47\u0027:\n This was already deprecated, but not picked up by the tool DO NOT MERGE\n" }, { "commit": "58300000c1867eaf10fbfb91c53d1b86a37f5b47", "tree": "c45d890d8c5330d8d6d74df309a1f15bde5486b0", "parents": [ "b6a007c5cd7bb02250d4dd573ba89367a010a473" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Fri Sep 10 16:58:33 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Fri Sep 10 16:58:58 2010 -0400" }, "message": "This was already deprecated, but not picked up by the tool DO NOT MERGE\n\nChange-Id: I4740a37039d0817a7f433f169ac2afc074101533\n" }, { "commit": "bc234a19f4c74116454e2c77f4739290e761995a", "tree": "668ae749379ac0be306c796ed7bc731b18dda8e4", "parents": [ "ad8f2191d81181587cb2d41bf0cf08a3da908f94" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu Sep 09 17:03:50 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Fri Sep 10 11:51:10 2010 -0700" }, "message": "Clean up action bar styles\n\nChange-Id: Ib19698e08d643994c4416aac29a43e9197bbe1f3\n" }, { "commit": "3d6b009db124615a09e2c6dcf25bf8352f6aaca9", "tree": "fd62f638908e2c4828a7e42a93912e492c588cc3", "parents": [ "200c13d37fb394c218a3824c428a116207266316", "09f1e2b2151ea18c05b9138a0a5cb63af18ea373" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Sep 10 11:29:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 10 11:29:10 2010 -0700" }, "message": "am 09f1e2b2: resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp\n\nMerge commit \u002709f1e2b2151ea18c05b9138a0a5cb63af18ea373\u0027\n\n* commit \u002709f1e2b2151ea18c05b9138a0a5cb63af18ea373\u0027:\n Initial contribution from Sony Corporation.\n" }, { "commit": "09f1e2b2151ea18c05b9138a0a5cb63af18ea373", "tree": "a8867b197b5f31b9fc3d59dc724ffc9f1e43f3b3", "parents": [ "94db0238a3b6cba3cbf0e037af74e898a4741204", "56aa3c761d4e8c618151e92135706838abd84a6c" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Sep 10 09:53:43 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Sep 10 09:53:43 2010 -0700" }, "message": "resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp\n\nChange-Id: I3d36a665f93f976824592edf35f6d6a205cc7617\n" }, { "commit": "69a1b6b17b47cc32e52b45e51719b4e01036b3ca", "tree": "7630a2443b24a0efb459134f4b0cd0f69d7a613b", "parents": [ "f47f8bc31022010cb6b8f4c50f0f888bc5689163" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Thu Sep 09 15:07:33 2010 -0700" }, "committer": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Thu Sep 09 15:49:48 2010 -0700" }, "message": "Revert \"update-api step missing from 65349\"\n\nThis reverts commit d6d15bcbac5e0e490662a371de52f00046626c5d.\n\nChange-Id: Id7a7f0f539fe7d07ab1f5c7c72c0bce222e442d1\n" }, { "commit": "cad0cffe24380b19dbda6b7e3326e82b65694496", "tree": "9ec48c0164a6eced8a8ac47d29b48cf1bb8a71c9", "parents": [ "127612855a5c73ed4d8b2b46a540626da4f5c6cb" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Thu Sep 09 14:58:16 2010 -0700" }, "committer": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Thu Sep 09 14:58:52 2010 -0700" }, "message": "update-api step missing from 65349\n\nChange-Id: Iaa3fc8fd67a48bb3b809b062a79e98965f15f937\n" }, { "commit": "c8532dac2122b17cd4ad9007ee4351bdae07384d", "tree": "020a15aac751e23a53e6aec386630ceb32f0b1af", "parents": [ "12e85311f4d8de8011f1c4b10320a399ba97597f", "1ed20dc43b070903597c55738f342bc77f7ab21d" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Thu Sep 09 14:22:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 09 14:22:12 2010 -0700" }, "message": "am 1ed20dc4: am e3692d15: Merge \"Hidden API to control sorting of download manager queries.\" into gingerbread\n\nMerge commit \u00271ed20dc43b070903597c55738f342bc77f7ab21d\u0027\n\n* commit \u00271ed20dc43b070903597c55738f342bc77f7ab21d\u0027:\n Hidden API to control sorting of download manager queries.\n" }, { "commit": "1ed20dc43b070903597c55738f342bc77f7ab21d", "tree": "cfd1242b0dc45c7e719f8a0b92f9dc27f7beca9c", "parents": [ "a9ff29b59cf33e552285a0bff3caf7a44f93f1c0", "e3692d153e0f66a5620eb96bd75ce92585b9fc04" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Thu Sep 09 11:26:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 09 11:26:08 2010 -0700" }, "message": "am e3692d15: Merge \"Hidden API to control sorting of download manager queries.\" into gingerbread\n\nMerge commit \u0027e3692d153e0f66a5620eb96bd75ce92585b9fc04\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e3692d153e0f66a5620eb96bd75ce92585b9fc04\u0027:\n Hidden API to control sorting of download manager queries.\n" }, { "commit": "f054e190bb6f06e5645826c84670098159feaf34", "tree": "f645f73c2ac347526799c42a1858f9cd4695e6e7", "parents": [ "9395b4656aca4b00d080ada89a44631459ad7b85" ], "author": { "name": "Steve Howard", "email": "showard@google.com", "time": "Wed Sep 01 18:26:26 2010 -0700" }, "committer": { "name": "Steve Howard", "email": "showard@google.com", "time": "Thu Sep 09 11:14:20 2010 -0700" }, "message": "Hidden API to control sorting of download manager queries.\n\nThis change adds a hidden API to sort download manager queries by size\nrather than by time last modified. This is necessary for the system\ndownload manager UI but, in the interest of keeping the new public API\nas minimal as possible for now, I\u0027m leaving @hide on this method.\n\nThis change also changes the DownloadManager.COLUMN_ID column to be\nidentical to BaseColumns._ID, since some code relies on this (such as\nCursorAdapter).\n\nChange-Id: Ib89b614d63e988974d4486b122b39365b35b5269\n" }, { "commit": "079fd1c0a329b0fbd3761abe2e900a941131efed", "tree": "72f2197f1d27da41c55d6f291176bfce6c28e118", "parents": [ "1e3187c27f878c083170149e645b1e2d19bc40a6" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Sep 08 19:31:29 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Sep 08 21:40:54 2010 -0700" }, "message": "Make action buttons more style-based\n\nChange-Id: Ia7ef4da8d8004f1b3809b4883aafc541695d235a\n" }, { "commit": "13831586874fab1592a9d6f9134a693b0b27bae8", "tree": "466fb3dc1374f10da6d3be11659e299f260cb3f2", "parents": [ "b149f57d5ebe6afef819766962eee45c12bb5a5f", "573c5d5edc1f51fd026e1d0e17ab883403eeddd9" ], "author": { "name": "Mike LeBeau", "email": "mlebeau@android.com", "time": "Wed Sep 08 17:49:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 17:49:34 2010 -0700" }, "message": "am 573c5d5e: am 46b84d5b: Merge \"Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\\\u0027s new \"listen to\" Voice Action.\" into gingerbread\n\nMerge commit \u0027573c5d5edc1f51fd026e1d0e17ab883403eeddd9\u0027\n\n* commit \u0027573c5d5edc1f51fd026e1d0e17ab883403eeddd9\u0027:\n Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended\n" }, { "commit": "573c5d5edc1f51fd026e1d0e17ab883403eeddd9", "tree": "ed20e63dc5aaf704eb44fa5fc0325f9eaac7e328", "parents": [ "e126119c3a406bc564f2549aeb1416aff112689d", "46b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb" ], "author": { "name": "Mike LeBeau", "email": "mlebeau@android.com", "time": "Wed Sep 08 17:46:22 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 17:46:22 2010 -0700" }, "message": "am 46b84d5b: Merge \"Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\\\u0027s new \"listen to\" Voice Action.\" into gingerbread\n\nMerge commit \u002746b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb\u0027 into gingerbread-plus-aosp\n\n* commit \u002746b84d5b4a44dbab8e0f6ee11f3ab42e11ce97bb\u0027:\n Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended\n" }, { "commit": "2fe6fd055874ff70a9faeaa27716173b12e671fb", "tree": "bf295afccc3e868fb39349890a0f54d88e74e6fe", "parents": [ "d9c80ab31ac3755141765e2c030bd1404ff0b050" ], "author": { "name": "Mike LeBeau", "email": "mlebeau@android.com", "time": "Wed Sep 08 19:10:17 2010 -0400" }, "committer": { "name": "Mike LeBeau", "email": "mlebeau@android.com", "time": "Wed Sep 08 20:39:05 2010 -0400" }, "message": "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended\nsearch and play of music. This is used, for instance, by Google\u0027s\nnew \"listen to\" Voice Action.\n\nChange-Id: Ibbc81701cc2412ffd57402d34f22d9764e9df7c2\n" }, { "commit": "ca259f4081404a8b4524b2fe80ab036182141ab7", "tree": "d1dd7bddc1e3320467629bf2317fe3f510b9bb99", "parents": [ "d5948d23a6a05c1c8126c67b483a08f7a364469a" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Sep 08 01:21:42 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Wed Sep 08 16:13:48 2010 -0700" }, "message": "Added resources and styles for ActionBar tabs\n\nChange-Id: I7ba5502146dec2d71b3e9ff57d90e7b5bd2bc2a0\n" }, { "commit": "b380c4d7edc158788a85c906900232675c0164ac", "tree": "579f4e6e8cd611c0f95302e0e53b6739b2e4d84e", "parents": [ "35dc79da11639117aab34d3278a7ae90984c0f87", "a05088c18d22f822e78e7b91d60f518dc3dc06fc" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 08 13:02:55 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 08 13:02:55 2010 -0700" }, "message": "resolved conflicts for merge of a05088c1 to master\n\nChange-Id: I7973f9f28586dec9b9659f8f662f40db7997a521\n" }, { "commit": "6bb72458f934f00fdfee75323a7919a9f10eba03", "tree": "530a14e47927706c63fb45ce7f4953c9538b448c", "parents": [ "a05088c18d22f822e78e7b91d60f518dc3dc06fc", "de2f3340d64e20e51029ff438f0d635d97b8a3e0" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 08 12:29:49 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 12:29:49 2010 -0700" }, "message": "am de2f3340: Update current.xml for touch filtering feature.\n\nMerge commit \u0027de2f3340d64e20e51029ff438f0d635d97b8a3e0\u0027 into gingerbread-plus-aosp\n\n* commit \u0027de2f3340d64e20e51029ff438f0d635d97b8a3e0\u0027:\n Update current.xml for touch filtering feature.\n" }, { "commit": "de2f3340d64e20e51029ff438f0d635d97b8a3e0", "tree": "64d05ff63b40cbbda31eca83914683f6f8614b66", "parents": [ "85a3176704b5bfbeece9bd928369fbb76eec7dc6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 08 12:25:23 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 08 12:25:23 2010 -0700" }, "message": "Update current.xml for touch filtering feature.\n\nChange-Id: I4a6f971ad84e13ed8f81e7b00c727e94eb2d8765\n" }, { "commit": "a05088c18d22f822e78e7b91d60f518dc3dc06fc", "tree": "2aedf7f9109bf4d1f7bc014476e0823182686be4", "parents": [ "6ffee9bbba53700d33456261b986ac8a3f333b9e", "85a3176704b5bfbeece9bd928369fbb76eec7dc6" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 08 11:55:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 11:55:24 2010 -0700" }, "message": "am 85a31767: Add support for secure views.\n\nMerge commit \u002785a3176704b5bfbeece9bd928369fbb76eec7dc6\u0027 into gingerbread-plus-aosp\n\n* commit \u002785a3176704b5bfbeece9bd928369fbb76eec7dc6\u0027:\n Add support for secure views.\n" }, { "commit": "85a3176704b5bfbeece9bd928369fbb76eec7dc6", "tree": "1a84f21c037b514c5b6717b106f5a9a2c4fd6c99", "parents": [ "c0b4f6d30d962d75125628317b5f5ea622531dfe" ], "author": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 01 17:01:00 2010 -0700" }, "committer": { "name": "Jeff Brown", "email": "jeffbrown@google.com", "time": "Wed Sep 08 11:50:55 2010 -0700" }, "message": "Add support for secure views.\n\nAdded the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the\ninput manager whenever another visible window is partly or wholly obscured\nthe target of a touch event so that applications can filter touches\naccordingly.\n\nAdded a \"filterTouchesWhenObscured\" attribute to View which can be used to\nenable filtering of touches when the view\u0027s window is obscured.\n\nChange-Id: I936d9c85013fd2d77fb296a600528d30a29027d2\n" }, { "commit": "d41b037c6b645768bf55d4d9efb4904373bd61b0", "tree": "7a009289317cbd909e1bf90d634e240a4b15eb85", "parents": [ "33788f9fb55a328927d2c15d7a3a13188480c717", "c4f628a1ba359926cf53ed7652d9abba6ea29123" ], "author": { "name": "Erik", "email": "roboerik@android.com", "time": "Wed Sep 08 11:04:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 11:04:41 2010 -0700" }, "message": "am c4f628a1: am c0b4f6d3: Merge \"Adds a time zone parameter to formatDateRange\" into gingerbread\n\nMerge commit \u0027c4f628a1ba359926cf53ed7652d9abba6ea29123\u0027\n\n* commit \u0027c4f628a1ba359926cf53ed7652d9abba6ea29123\u0027:\n Adds a time zone parameter to formatDateRange\n" }, { "commit": "c4f628a1ba359926cf53ed7652d9abba6ea29123", "tree": "80eb685ecbd0f371ce3325c0e6c994c37492d56e", "parents": [ "d4fd86d19a070a355255b51742075fbf8e69fa4a", "c0b4f6d30d962d75125628317b5f5ea622531dfe" ], "author": { "name": "Erik", "email": "roboerik@android.com", "time": "Wed Sep 08 11:01:27 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 08 11:01:27 2010 -0700" }, "message": "am c0b4f6d3: Merge \"Adds a time zone parameter to formatDateRange\" into gingerbread\n\nMerge commit \u0027c0b4f6d30d962d75125628317b5f5ea622531dfe\u0027 into gingerbread-plus-aosp\n\n* commit \u0027c0b4f6d30d962d75125628317b5f5ea622531dfe\u0027:\n Adds a time zone parameter to formatDateRange\n" }, { "commit": "577ec9eb3a661de96a2cbe9ec918eda082fb7659", "tree": "5bf3f0c170978bf52c421386f62e5381f65d045c", "parents": [ "4c7d3f28898f4e0d8e9f54537fb92948e650df7f" ], "author": { "name": "Erik", "email": "roboerik@android.com", "time": "Wed Sep 01 17:24:53 2010 -0700" }, "committer": { "name": "Erik", "email": "roboerik@android.com", "time": "Wed Sep 08 10:53:40 2010 -0700" }, "message": "Adds a time zone parameter to formatDateRange\n\nFor a critical feature request in Calendar we need the ability\nto format a date range in a time zone other than the local tz.\nThis adds a new method signature to formatDateRange to allow for\na tz to be specified and maintains the old behavior if the parameter\nis not used. Also deprecates the FORMAT_UTC flag.\n\nChange-Id: I16b3e939760ec86c954b51a318d01b7bbf86acc9\n" }, { "commit": "a18a86b43e40e3c15dcca0ae0148d641be9b25fe", "tree": "80f115b33fa69994f3cf7347d77c3463d1eda439", "parents": [ "789a47488c0e834eb80fe6b596dcc3e0ba7f1344" ], "author": { "name": "Chet Haase", "email": "chet@google.com", "time": "Tue Sep 07 13:20:00 2010 -0700" }, "committer": { "name": "Chet Haase", "email": "chet@google.com", "time": "Wed Sep 08 09:41:21 2010 -0700" }, "message": "Rename several animation classes\n\nChange-Id: I6a4544875090db485163c8d56de8718f56d267c7\n" }, { "commit": "4a070cd0022f1950ea115a4b189d64099d45f42f", "tree": "605ffd7022d21600a84e11fbdaa4ba539a1603a0", "parents": [ "0486f78ef32dfddb51c82f12be533712a35376d8", "e0974284a8983524c8719a47e57395f0030c3128" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Tue Sep 07 22:10:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 07 22:10:45 2010 -0700" }, "message": "am e0974284: am d6e56895: update-api step missing from 64963.\n\nMerge commit \u0027e0974284a8983524c8719a47e57395f0030c3128\u0027\n\n* commit \u0027e0974284a8983524c8719a47e57395f0030c3128\u0027:\n update-api step missing from 64963.\n" }, { "commit": "e0974284a8983524c8719a47e57395f0030c3128", "tree": "f7e602306411cabe9c4ab18efff399de1d42c537", "parents": [ "b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d", "d6e56895f647d3c6ea33cea15fdb7b1e9ff3f537" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Tue Sep 07 21:48:39 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 07 21:48:39 2010 -0700" }, "message": "am d6e56895: update-api step missing from 64963.\n\nMerge commit \u0027d6e56895f647d3c6ea33cea15fdb7b1e9ff3f537\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d6e56895f647d3c6ea33cea15fdb7b1e9ff3f537\u0027:\n update-api step missing from 64963.\n" }, { "commit": "2b6230e0de4bac2829ac27b19e95ba75c3da82b4", "tree": "8f8a13e0f8b709ef1bdb1120bb8678fa63c53f5b", "parents": [ "8fbc471199b157d40d709dbde6ea538a16444cfc" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Tue Sep 07 17:55:25 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Tue Sep 07 21:02:12 2010 -0700" }, "message": "Reworking the ActionBar tab API\n\nChange-Id: Ifbcdc61b4a24633cc1a329c73923b95b03e9ecf0\n" }, { "commit": "d6e56895f647d3c6ea33cea15fdb7b1e9ff3f537", "tree": "57d8c5d94a85f402c560b3abaa381434bdddc24c", "parents": [ "64591009409618ee67e71c4b345cac50ad0e4e31" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Tue Sep 07 20:28:27 2010 -0700" }, "committer": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Tue Sep 07 20:29:42 2010 -0700" }, "message": "update-api step missing from 64963.\n\nChange-Id: I7e91aa9830c19bbb4115ae3a236345b220dc9eb0\n" }, { "commit": "2ae3718b448cdc5e94b4686795301a01f54640e4", "tree": "301ceca204a1e76a3becb6ea356e32900ebcc3b8", "parents": [ "59a5d2d5772f41578c72f48df08c0af918b6519c", "dbd25cdbc3dcad573aaeaf493bc186006bce3d8e" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Tue Sep 07 18:59:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 07 18:59:10 2010 -0700" }, "message": "am dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGE\n\nMerge commit \u0027dbd25cdbc3dcad573aaeaf493bc186006bce3d8e\u0027 into gingerbread-plus-aosp\n\n* commit \u0027dbd25cdbc3dcad573aaeaf493bc186006bce3d8e\u0027:\n Made text selection work in ExtractEditText. DO NOT MERGE\n" }, { "commit": "7d8bb82dca1f2396ce611bd1587158aa0895ec46", "tree": "b1ff7ee3fb8fd01143108e4683891b6da5c59ff8", "parents": [ "c24ffe6fdc34964442f2fe4c223c856bde8e1e96", "d348ea6e0ad3fc029a01c214da4ad4b8d856c4f9" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Tue Sep 07 18:39:03 2010 -0700" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Tue Sep 07 18:39:03 2010 -0700" }, "message": "Merge commit \u0027d348ea6e0ad3fc029a01c214da4ad4b8d856c4f9\u0027 into manual-merge\n\nConflicts:\n\tcore/res/res/values/public.xml\n\nChange-Id: Id80cc50b669d7ea840d28839431126023980e5a1\n" }, { "commit": "dbd25cdbc3dcad573aaeaf493bc186006bce3d8e", "tree": "9dd10a772a2771fce5bcc54e1cd2702bcf059b6c", "parents": [ "d0f74ae081bac9a9c8f7faf9288305647735d743" ], "author": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Tue Sep 07 15:21:14 2010 -0700" }, "committer": { "name": "Gilles Debunne", "email": "debunne@google.com", "time": "Tue Sep 07 18:07:30 2010 -0700" }, "message": "Made text selection work in ExtractEditText. DO NOT MERGE\n\nChange insertion point on tap is no longer handled by the CommitSelectionReceiver\n(as it is not called by ExtractEditText).\n\nFixed a bug to handle drawing positions when the internal TextView scroller is used.\n\nChange-Id: I87398c7109c5527d21dee6abbdb925848244d594\n" }, { "commit": "d348ea6e0ad3fc029a01c214da4ad4b8d856c4f9", "tree": "582d5743e0661f4b2f8ba07de42d4485edce9d71", "parents": [ "3f6e4d56bba393ac556a672202e00bc417784ce8", "1f6a21c2377f33a754222a34fa98ea1e21a6d27d" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue Sep 07 14:46:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 07 14:46:08 2010 -0700" }, "message": "am 1f6a21c2: Merge \"Expose the TextAppearance.StatusBar.* styles.\" into gingerbread\n\nMerge commit \u00271f6a21c2377f33a754222a34fa98ea1e21a6d27d\u0027 into gingerbread-plus-aosp\n\n* commit \u00271f6a21c2377f33a754222a34fa98ea1e21a6d27d\u0027:\n Expose the TextAppearance.StatusBar.* styles.\n" }, { "commit": "ccfc1c1ea1898d7e72bc2c2c78bf80a26ee3f5f4", "tree": "321be9d532b4c770e1b1a46e3ceae95cb1fceead", "parents": [ "f703b77c96a6d133fda534158eaf6190ff7c87f7" ], "author": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue Sep 07 17:12:10 2010 -0400" }, "committer": { "name": "Joe Onorato", "email": "joeo@google.com", "time": "Tue Sep 07 17:12:10 2010 -0400" }, "message": "Expose the TextAppearance.StatusBar.* styles.\n\nChange-Id: I6e1e68ab26495290d480f4fb75facedd6cd62908\n" }, { "commit": "db3c15df150e489f663df72e8aa85c2102cd5fec", "tree": "a600f690a582ae64813387c1be95941e73b9167c", "parents": [ "a14c8e0c67223fdc9a0746b370ae594a92530e78" ], "author": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Fri Sep 03 17:25:04 2010 -0700" }, "committer": { "name": "Romain Guy", "email": "romainguy@google.com", "time": "Fri Sep 03 17:25:04 2010 -0700" }, "message": "Fix the build.\n\nChange-Id: I3a8a1b3510c66c3624f1c35f71b444a391b757cb\n" }, { "commit": "0fd4c1704952b8489307b8a118167a8e7c511d04", "tree": "5dd451eadd8c82523b98cabbf5e786640e0a8055", "parents": [ "bcb284c1960df025dc671c10a97ec0c599ce9a11", "783f14ddc9e4032b72aed7880aeb9d39970c98b7" ], "author": { "name": "Jesse Wilson", "email": "jessewilson@google.com", "time": "Fri Sep 03 16:55:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 03 16:55:24 2010 -0700" }, "message": "am 783f14dd: am 3326f804: Fix the last remaining gaps in our Java 6 API.\n\nMerge commit \u0027783f14ddc9e4032b72aed7880aeb9d39970c98b7\u0027\n\n* commit \u0027783f14ddc9e4032b72aed7880aeb9d39970c98b7\u0027:\n Fix the last remaining gaps in our Java 6 API.\n" }, { "commit": "783f14ddc9e4032b72aed7880aeb9d39970c98b7", "tree": "67007d91d23ff0c6b69ff58c26965017b2fdf3c8", "parents": [ "ef9e508c2cb3b52d31250ceca3dddace17cec950", "3326f8043858152ea2a407a9a4c20fdcdc859e73" ], "author": { "name": "Jesse Wilson", "email": "jessewilson@google.com", "time": "Fri Sep 03 16:42:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 03 16:42:51 2010 -0700" }, "message": "am 3326f804: Fix the last remaining gaps in our Java 6 API.\n\nMerge commit \u00273326f8043858152ea2a407a9a4c20fdcdc859e73\u0027 into gingerbread-plus-aosp\n\n* commit \u00273326f8043858152ea2a407a9a4c20fdcdc859e73\u0027:\n Fix the last remaining gaps in our Java 6 API.\n" }, { "commit": "3326f8043858152ea2a407a9a4c20fdcdc859e73", "tree": "ca81086dc9ddb8c0d6875f05903a29b15a5352df", "parents": [ "7e427934e69db804f3ee803e6ffeef4a339e9b8b" ], "author": { "name": "Jesse Wilson", "email": "jessewilson@google.com", "time": "Fri Sep 03 16:34:59 2010 -0700" }, "committer": { "name": "Jesse Wilson", "email": "jessewilson@google.com", "time": "Fri Sep 03 16:37:27 2010 -0700" }, "message": "Fix the last remaining gaps in our Java 6 API.\n\nSee http://b/issue?id\u003d2497395\nSee https://android-git.corp.google.com/g/64647\n\nChange-Id: I0886e06163a3853bff69480b01e6e9f9f54fea4e\n" }, { "commit": "13cc1207fab68adc5c7da0bf3b365196e26a273e", "tree": "2d185227600a4bf346de05161367e2412fd286ec", "parents": [ "2cb3e29e823de1130c7649c0c515485917ab188c" ], "author": { "name": "Chet Haase", "email": "chet@google.com", "time": "Fri Sep 03 15:39:20 2010 -0700" }, "committer": { "name": "Chet Haase", "email": "chet@google.com", "time": "Fri Sep 03 16:22:22 2010 -0700" }, "message": "Add ability to enable layout transition animations by default from XML\n\nChange-Id: I2b884c83e868f5d22ef85d65ff8ee984633de65e\n" }, { "commit": "acc4e041d27c24b45fb190c493717fda987b52c2", "tree": "dcf0401e624eef3b7594e50513f34762903e53cb", "parents": [ "6a3ffb5beeb6d88c5c1916bef60265f73f9e1822", "69717ccd13bb5568b912701ab39d603cfa7091cc" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 15:23:46 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 03 15:23:46 2010 -0700" }, "message": "am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready.\n\nMerge commit \u002769717ccd13bb5568b912701ab39d603cfa7091cc\u0027 into gingerbread-plus-aosp\n\n* commit \u002769717ccd13bb5568b912701ab39d603cfa7091cc\u0027:\n DO NOT MERGE. Some stuff that is Not Ready.\n" }, { "commit": "69717ccd13bb5568b912701ab39d603cfa7091cc", "tree": "867742e28adc250e7260dbf04aba967f50264e0c", "parents": [ "df3a0f50c3480911e366c8c0781b0463fe063e82" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 13:48:20 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 15:20:06 2010 -0700" }, "message": "DO NOT MERGE. Some stuff that is Not Ready.\n\nChange-Id: I8fdba32722d86b92c791dbf7c6c0166bcdb02852\n" }, { "commit": "6c82f673f6c01cdcf7ede82c67601fbd53d090f3", "tree": "144beabb206bb3ed104a48f716bc01bb5ebfb423", "parents": [ "1ab9d1289b0e31033ba87490f185732e08bed7b5", "fd3f44b38882c74c10aff0e238ee4ad9fcd8b724" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 15:14:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 03 15:14:57 2010 -0700" }, "message": "am fd3f44b3: am e1aa82a4: Merge \"Adding a feature denoting support for 5 or more fully independent multitouch pointers.\" into gingerbread\n\nMerge commit \u0027fd3f44b38882c74c10aff0e238ee4ad9fcd8b724\u0027\n\n* commit \u0027fd3f44b38882c74c10aff0e238ee4ad9fcd8b724\u0027:\n Adding a feature denoting support for 5 or more fully\n" }, { "commit": "fd3f44b38882c74c10aff0e238ee4ad9fcd8b724", "tree": "34c1a39a417f582af183eaa7b1947289a5a5fc83", "parents": [ "8e11c82247151085fa165c76bfbc157bc6091ca4", "e1aa82a4228d009537693253ba3a0113abbf5ab8" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 15:10:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 03 15:10:24 2010 -0700" }, "message": "am e1aa82a4: Merge \"Adding a feature denoting support for 5 or more fully independent multitouch pointers.\" into gingerbread\n\nMerge commit \u0027e1aa82a4228d009537693253ba3a0113abbf5ab8\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e1aa82a4228d009537693253ba3a0113abbf5ab8\u0027:\n Adding a feature denoting support for 5 or more fully\n" }, { "commit": "6993d3d136fed8600a3e337d710907b50d8d6e49", "tree": "cf33f50672753a610822f39c3c1f5a4491843485", "parents": [ "dc243482d6e104c4a3cddaa694c2ee3c628c2c20" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Fri Sep 03 14:30:14 2010 -0700" }, "committer": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Fri Sep 03 14:41:36 2010 -0700" }, "message": "Adding a feature denoting support for 5 or more fully\nindependent multitouch pointers.\n\nChange-Id: I9997ed9c481dbd507e9eff70d8beb9e1140cca3f\n" }, { "commit": "004abb12238d34cf9567d70eac194983636524bd", "tree": "cf72d916f7aea1f147ba83ad5df0cd80d7c12163", "parents": [ "8ae409f50156394b517a86a8d171938e0aa32897", "3d7d3690defa2e63a60b0d9133608cf771cdbca7" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 14:07:25 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 14:07:25 2010 -0700" }, "message": "resolved conflicts for merge of 3d7d3690 to master\n\nChange-Id: I1d1d7a448b3ae8a86600addfa75f2448a98327bf\n" }, { "commit": "3d7d3690defa2e63a60b0d9133608cf771cdbca7", "tree": "c0092d09979ac75d9028435066a1abba32b22239", "parents": [ "bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb", "e25b4bc76fef584b38ce4e72f919fba119bdfa99" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 13:26:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 03 13:26:30 2010 -0700" }, "message": "am e25b4bc7: Merge \"These are not ready to be exposed. Also rename them to be better.\" into gingerbread\n\nMerge commit \u0027e25b4bc76fef584b38ce4e72f919fba119bdfa99\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e25b4bc76fef584b38ce4e72f919fba119bdfa99\u0027:\n These are not ready to be exposed. Also rename them to be better.\n" }, { "commit": "482566ed5cc7307b0401361509fb06acc5476115", "tree": "3a41c2b2301bf17dc1575d32641a8cbfaa9e7af9", "parents": [ "46e63b346770efa14451b8e67b7f7636c4e5a76c" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 12:51:28 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Fri Sep 03 12:51:28 2010 -0700" }, "message": "These are not ready to be exposed. Also rename them to be better.\n\nChange-Id: I7c234144497084b7769f8c46761b7d74d1c583d5\n" }, { "commit": "21cd1389d2ef218b20994b617c57af120841a57f", "tree": "422cb6919f42bb48d5327d743a45d8c1be5d2991", "parents": [ "b062f02d54b97dd45c810a6bb4544c94ff4ed0f1" ], "author": { "name": "Chet Haase", "email": "chet@google.com", "time": "Wed Sep 01 17:42:29 2010 -0700" }, "committer": { "name": "Chet Haase", "email": "chet@google.com", "time": "Fri Sep 03 12:20:00 2010 -0700" }, "message": "Add transition effects for layout changes on ViewGroups\n\nChange-Id: Ibefcca5692450188fbcec608f3f7e36be1213b21\n" }, { "commit": "d477176d3fe6436ab0df9aa39fc3a43d82851ca5", "tree": "dedfc15ab9579823b11ad31363551878c17b1587", "parents": [ "0a01f076d221ccdaf360cac83e42e92b97ee3900" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu Sep 02 18:07:49 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu Sep 02 18:07:49 2010 -0700" }, "message": "Make spinnerMode attribute for Spinner widgets public\n\nChange-Id: Ib448f8511cc7ff92ad8120a891ccaa8cdde6c9dc\n" }, { "commit": "47c41e807e36999e4d0d2072e41a82bc45655ff2", "tree": "58400eef40c903d6f0dc921c268eda4a26b2dd56", "parents": [ "18931f578ee8be8f621e24cabf98d9b66ace5dbf" ], "author": { "name": "Erik", "email": "roboerik@android.com", "time": "Wed Sep 01 15:39:08 2010 -0700" }, "committer": { "name": "Erik", "email": "roboerik@android.com", "time": "Thu Sep 02 17:10:02 2010 -0700" }, "message": "Added methods for getting the x and y span\n\nWe would like to separate x and y for our pinch gestures. This\nchange adds methods for returning those independently instead of\nonly allowing access to the total span.\n\nChange-Id: I2f54cd83602e447174a49035237da379a573b63e\n" }, { "commit": "fef364f75b00e238d28a81e1168bbfc945ce8d23", "tree": "ccdc1faf2a0f332bebeb1b5f0e02a14c41a91638", "parents": [ "355a17c4f853c235a18380e71e1aa446f72fa5eb" ], "author": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu Sep 02 15:11:46 2010 -0700" }, "committer": { "name": "Adam Powell", "email": "adamp@google.com", "time": "Thu Sep 02 15:56:04 2010 -0700" }, "message": "Fix bug 2957414 - Add Spinner constructor for selecting dialog/dropdown mode\n\nChange-Id: I7ea2bbf7d387bdd3e0cb59a1b9b24406560680b7\n" }, { "commit": "16750623421fb404181b12ae04baa2fe26c5b9dd", "tree": "97bf961c8036e6ec3f69a65862a68cf793372022", "parents": [ "aa904f48cf3e3a31cc43806fee0e17af607c7fae" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Wed Sep 01 19:18:57 2010 -0700" }, "committer": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Thu Sep 02 15:00:19 2010 -0700" }, "message": "Adding features for new hardware, and creating a baseline list of required\nhardware for the Tablet profile. This is very much subject to change.\n\nChange-Id: Id0921b373cf610a7ec9ddd75dc020bf8b22a6911\n" }, { "commit": "aa904f48cf3e3a31cc43806fee0e17af607c7fae", "tree": "9d759bcc991f10f44cc7deb747dd83af22f2148d", "parents": [ "d63760c1e93a150910701d2d08a45b5c6899bbb6" ], "author": { "name": "Andrew Stadler", "email": "stadler@android.com", "time": "Thu Sep 02 14:50:08 2010 -0700" }, "committer": { "name": "Andrew Stadler", "email": "stadler@android.com", "time": "Thu Sep 02 14:50:08 2010 -0700" }, "message": "Add startPreferenceFragment()\n\nThis allows sub-fragments to be started directly via API\n\nChange-Id: I6c8b86a911c8731068459eb9cdd3d37970fc9d0e\n" }, { "commit": "1ecf551b80d91552fe7e1a56ede8f21bbe99b144", "tree": "2460a5c0fa9477a963007809cbe0a9ad86b601ac", "parents": [ "dcfd5d784c7d474e0932604a9f0dff591c3210e2" ], "author": { "name": "Dmitri Plotnikov", "email": "dplotnikov@google.com", "time": "Thu Sep 02 11:00:04 2010 -0700" }, "committer": { "name": "Dmitri Plotnikov", "email": "dplotnikov@google.com", "time": "Thu Sep 02 11:00:04 2010 -0700" }, "message": "Contacts API clean-up (mostly documentation)\n\n- Fixing column list for the Photo table.\n- Fixing column list for the AggregationSuggestions table.\n- Allowing CONTENT_LOOKUP_URI to be used with directories:\nData, AggregationSuggestions and Photo.\n\nChange-Id: I3dbcc28df0029e1fcb2140efd2047707a0cdd947\n" }, { "commit": "90cb9d04fec34c1bf0cee38bfcd1bfa3359dbcf6", "tree": "91c89568e122e53b3e89a028a959fd1e2e9ec247", "parents": [ "a5034b5d802d0573808dc0fab7a71f9283ad3994" ], "author": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Thu Sep 02 00:26:15 2010 -0700" }, "committer": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Thu Sep 02 00:26:15 2010 -0700" }, "message": "Update current.xml to fix the build\n\nChange-Id: I85a01bced5a72a7a5298daec008a779c6239d305\n" }, { "commit": "a5034b5d802d0573808dc0fab7a71f9283ad3994", "tree": "56b4eab290e0f7b8adf0abeb24dcedd399df4298", "parents": [ "8f5edc93b622bbdc33db24d348480fd7d55afb41", "75823339cd03e5b25b576cd7a2b5941254017c4a" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 23:20:18 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 23:20:18 2010 -0700" }, "message": "am 75823339: am a1c69e08: Fix a small bug when granting permissions through activity results.\n\nMerge commit \u002775823339cd03e5b25b576cd7a2b5941254017c4a\u0027\n\n* commit \u002775823339cd03e5b25b576cd7a2b5941254017c4a\u0027:\n Fix a small bug when granting permissions through activity results.\n" }, { "commit": "75823339cd03e5b25b576cd7a2b5941254017c4a", "tree": "6c6d0788c0439f73e5e3c428a41eb3ef306ff4ea", "parents": [ "840f0fecd87357cadf4b2a0ae96d30b457f89729", "a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 23:17:20 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 23:17:20 2010 -0700" }, "message": "am a1c69e08: Fix a small bug when granting permissions through activity results.\n\nMerge commit \u0027a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4\u0027:\n Fix a small bug when granting permissions through activity results.\n" }, { "commit": "8f5edc93b622bbdc33db24d348480fd7d55afb41", "tree": "ee04837e6ce2587daec5e508d02bb344f97d9eaa", "parents": [ "0ed0221e9c01753eb8cf312ea9d148a0097a99a1", "840f0fecd87357cadf4b2a0ae96d30b457f89729" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 22:55:04 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 22:55:04 2010 -0700" }, "message": "am 840f0fec: am d3efa392: Clean up some permissions.\n\nMerge commit \u0027840f0fecd87357cadf4b2a0ae96d30b457f89729\u0027\n\n* commit \u0027840f0fecd87357cadf4b2a0ae96d30b457f89729\u0027:\n Clean up some permissions.\n" }, { "commit": "a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4", "tree": "a7717db542b45f4ad8fa9dc7f22c0a663d047c6b", "parents": [ "d3efa3924407da6d38aa5931ac29aa088d9eb986" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 22:55:02 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 22:55:02 2010 -0700" }, "message": "Fix a small bug when granting permissions through activity results.\n\nChange-Id: I2a5c4025fb5f566e29c219fde4d50ed2eba6e174\n" }, { "commit": "840f0fecd87357cadf4b2a0ae96d30b457f89729", "tree": "2bb31b208dc99b7f6621d83a221f74c152237e9c", "parents": [ "14d56840eeec537c037bebaeaebf1b37f48d8dad", "d3efa3924407da6d38aa5931ac29aa088d9eb986" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 22:51:35 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 22:51:35 2010 -0700" }, "message": "am d3efa392: Clean up some permissions.\n\nMerge commit \u0027d3efa3924407da6d38aa5931ac29aa088d9eb986\u0027 into gingerbread-plus-aosp\n\n* commit \u0027d3efa3924407da6d38aa5931ac29aa088d9eb986\u0027:\n Clean up some permissions.\n" }, { "commit": "d3efa3924407da6d38aa5931ac29aa088d9eb986", "tree": "105f4a08e32468c8fa20d981867b6e8fd688cd4e", "parents": [ "bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 17:34:12 2010 -0700" }, "committer": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed Sep 01 21:19:40 2010 -0700" }, "message": "Clean up some permissions.\n\nNote that WRITE_OWNER_DATA and READ_OWNER_DATA don\u0027t actually appear\nto be associated with anything or used by anyone, so they are just\ndeleted.\n\nAlso deprecate the activity API to go in the foreground. I didn\u0027t\nrealize that was released in the SDK. It needs to go away.\n\nChange-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a\n" }, { "commit": "5486dcb00a44f6367a880cf7ea7f699bfa1e15cb", "tree": "98ee43a951bd9921502fe924e4be7060b76ad00d", "parents": [ "5acddcef222f57d84e493042ca12ae46fb1d9ef2" ], "author": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Wed Sep 01 20:14:24 2010 -0700" }, "committer": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Wed Sep 01 20:14:24 2010 -0700" }, "message": "More fixes to current.xml to reflect the state of WebSettings\n\nChange-Id: I00f9c2a7242ebf34f8c67a8cf8a47afbfe70cc71\n" }, { "commit": "9dc2e75e2720a8d0a5d7b87be53300eac021a3f3", "tree": "e14be6b4f3fdc8c21545bc2373e31a6262776222", "parents": [ "f83d4f1779eb4801275a56023c343459a95009af" ], "author": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Wed Sep 01 19:11:14 2010 -0700" }, "committer": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Wed Sep 01 19:17:22 2010 -0700" }, "message": "Add Deprecated annotation to getPluginsPath/setPluginsPath\n\nJavadoc annotations aren\u0027t enough to properly mark an API\nas deprecated. This change adds the @Deprecated annotation\nto the source and updates current.xml.\n\nChange-Id: I04a398fc04ad99979c674789af5af994fbd25be0\n" }, { "commit": "9fadca71e455a6c849311083677351d4dc64b792", "tree": "6451d5bbb7bf41e67aeb2e6efa1fba1d96567caa", "parents": [ "3e4975a52ccd9dade7fffc9f8c144bff0f4c3cb1", "b766ab830a714c0b79f64265e681f454865ffe65" ], "author": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Wed Sep 01 19:16:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 19:16:41 2010 -0700" }, "message": "am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml\n\nMerge commit \u0027b766ab830a714c0b79f64265e681f454865ffe65\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b766ab830a714c0b79f64265e681f454865ffe65\u0027:\n DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml\n" }, { "commit": "b766ab830a714c0b79f64265e681f454865ffe65", "tree": "69f6856ae8156e0b5b403f08b7ac1afff07a07fe", "parents": [ "3424c02e6b931a8bbd651ae75217bebd008b2605" ], "author": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Wed Sep 01 19:02:26 2010 -0700" }, "committer": { "name": "Jason Chen", "email": "jasonchen@google.com", "time": "Wed Sep 01 19:04:18 2010 -0700" }, "message": "DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml\n\nPrevious changes only added javadoc annotation, but didn\u0027t apply\nannotation to the source. Fixing this and updating current.xml.\n\nChange-Id: I52aabd6485a3972fc360f24c2e86cc342a5101ab\n" }, { "commit": "f83d4f1779eb4801275a56023c343459a95009af", "tree": "4add9c90e3b09babc77834b85e6dc89b5053def3", "parents": [ "53d7765eac58f496355147f167fb345e825d6d54", "3e4975a52ccd9dade7fffc9f8c144bff0f4c3cb1" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 02 09:56:04 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 02 09:56:04 2010 +0800" }, "message": "resolved conflicts for merge of 3e4975a5 to master\n\nChange-Id: Icd382fc43c8a1975801ab42eb184b633520149c7\n" }, { "commit": "3e4975a52ccd9dade7fffc9f8c144bff0f4c3cb1", "tree": "627a3c5879f88b207af0f806d233b8c1e763ab71", "parents": [ "fd0eed007d99178092ede56ec2c4799046615f70", "3424c02e6b931a8bbd651ae75217bebd008b2605" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Wed Sep 01 18:01:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 18:01:31 2010 -0700" }, "message": "am 3424c02e: Add software features for SIP and VOIP\n\nMerge commit \u00273424c02e6b931a8bbd651ae75217bebd008b2605\u0027 into gingerbread-plus-aosp\n\n* commit \u00273424c02e6b931a8bbd651ae75217bebd008b2605\u0027:\n Add software features for SIP and VOIP\n" }, { "commit": "3424c02e6b931a8bbd651ae75217bebd008b2605", "tree": "f8113a62a05f612a54da4c277661542edbcb9773", "parents": [ "a2511da9d65b11be7f59ed3f525f77e85aeb4bef" ], "author": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Fri Aug 27 18:08:19 2010 +0800" }, "committer": { "name": "Hung-ying Tyan", "email": "tyanh@google.com", "time": "Thu Sep 02 08:10:13 2010 +0800" }, "message": "Add software features for SIP and VOIP\n\nand block SipService creation and SIP API if the feature is not available.\n\nChange-Id: Icf780af1ac20dda4d8180cea3e5b20e21a8350bc\n" }, { "commit": "90324669f21e0676e66bc4ed681be560bba5f188", "tree": "f39d27f158fc465d23a572ed71c801938122ae03", "parents": [ "b089a09764aebfdae824fd22ec77190c0ee62dcf", "61f1cbdd71942433ce1515b614ec3d9c259ea037" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Wed Sep 01 17:03:33 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 17:03:33 2010 -0700" }, "message": "am 61f1cbdd: am a800a2ef: Merge \"Adding a feature definition corresponding to support for Near-Field Communications (NFC).\" into gingerbread\n\nMerge commit \u002761f1cbdd71942433ce1515b614ec3d9c259ea037\u0027\n\n* commit \u002761f1cbdd71942433ce1515b614ec3d9c259ea037\u0027:\n Adding a feature definition corresponding to support for Near-Field\n" }, { "commit": "d79de7bc360a81feb12f8d0c9bb6c4aff92f9de1", "tree": "b5fb3d819d7d1232e3d63642eb602de92dd872b0", "parents": [ "59f6b0da29034747bb66466739cb565047c912b8", "4fd76ba2270da1df12ae11f6d3d3ed564e38464b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 01 16:57:58 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 16:57:58 2010 -0700" }, "message": "am 4fd76ba2: am 81f339bc: Merge \"Fixing the build.\" into gingerbread\n\nMerge commit \u00274fd76ba2270da1df12ae11f6d3d3ed564e38464b\u0027\n\n* commit \u00274fd76ba2270da1df12ae11f6d3d3ed564e38464b\u0027:\n Fixing the build.\n" }, { "commit": "61f1cbdd71942433ce1515b614ec3d9c259ea037", "tree": "9152ec01a4c86d5d28d54709d8875982faa50957", "parents": [ "b4de2f997591d3ee5f1eff92fbf2d4628cee5f2c", "a800a2efa29d88e198220753f07e7d9ff69ddd9b" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Wed Sep 01 15:05:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 15:05:34 2010 -0700" }, "message": "am a800a2ef: Merge \"Adding a feature definition corresponding to support for Near-Field Communications (NFC).\" into gingerbread\n\nMerge commit \u0027a800a2efa29d88e198220753f07e7d9ff69ddd9b\u0027 into gingerbread-plus-aosp\n\n* commit \u0027a800a2efa29d88e198220753f07e7d9ff69ddd9b\u0027:\n Adding a feature definition corresponding to support for Near-Field\n" }, { "commit": "4fd76ba2270da1df12ae11f6d3d3ed564e38464b", "tree": "69007b352f14c384546717cf1fb850d3ccd24190", "parents": [ "9088a3d153ef28dfa383fda0935d99bdc0c2b2f6", "81f339bcfeee5dccb284cdeac6941179f91fe08b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 01 14:53:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 14:53:12 2010 -0700" }, "message": "am 81f339bc: Merge \"Fixing the build.\" into gingerbread\n\nMerge commit \u002781f339bcfeee5dccb284cdeac6941179f91fe08b\u0027 into gingerbread-plus-aosp\n\n* commit \u002781f339bcfeee5dccb284cdeac6941179f91fe08b\u0027:\n Fixing the build.\n" }, { "commit": "76437d379357a418b8236b041d1b3e03939264e6", "tree": "6a89548e01f4f40a5b51b96f6a68c0a07cd1f557", "parents": [ "81f339bcfeee5dccb284cdeac6941179f91fe08b" ], "author": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Wed Sep 01 11:17:20 2010 -0700" }, "committer": { "name": "Dan Morrill", "email": "morrildl@google.com", "time": "Wed Sep 01 14:42:23 2010 -0700" }, "message": "Adding a feature definition corresponding to support for Near-Field\nCommunications (NFC).\n\nChange-Id: I32b1b949524bfd978f53e23e02d38dfba4a2ea9c\n" }, { "commit": "752fe99276656628d534ea80e07e7880e1425b7b", "tree": "0190095fa2c3822df27b8c6cde6e1162fa60b215", "parents": [ "e34fe69e66d8c9bc76453347ba84261b060300f3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 01 14:20:33 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 01 14:20:33 2010 -0700" }, "message": "Fixing the build.\n\nChange-Id: I6414a5ed2a92f5e375e19caf7453abd268ce76d3\n" }, { "commit": "edb3211c85f919b719cdec72922bceb476941dd3", "tree": "246065423e87513ced2d04205ca4ad4bac4d9cdf", "parents": [ "1b1c9a2e7f559cdeee39e15fca071c5f7e71070b", "27c6f7d44c592ab8685b93a2ec30a74d594c822d" ], "author": { "name": "Derek Sollenberger", "email": "djsollen@google.com", "time": "Wed Sep 01 13:18:40 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 13:18:40 2010 -0700" }, "message": "am 27c6f7d4: am 1614843e: Merge \"Fix invalid comment in WebSettings.\" into gingerbread\n\nMerge commit \u002727c6f7d44c592ab8685b93a2ec30a74d594c822d\u0027\n\n* commit \u002727c6f7d44c592ab8685b93a2ec30a74d594c822d\u0027:\n Fix invalid comment in WebSettings.\n" }, { "commit": "27c6f7d44c592ab8685b93a2ec30a74d594c822d", "tree": "199734736f12326cb8dcd94f06828a2136669f5c", "parents": [ "036b315747200b27cb1d5bc2d7d7cda9b9f8f1f0", "1614843e93d98910147380969d034009ecb23aa2" ], "author": { "name": "Derek Sollenberger", "email": "djsollen@google.com", "time": "Wed Sep 01 11:32:16 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 01 11:32:16 2010 -0700" }, "message": "am 1614843e: Merge \"Fix invalid comment in WebSettings.\" into gingerbread\n\nMerge commit \u00271614843e93d98910147380969d034009ecb23aa2\u0027 into gingerbread-plus-aosp\n\n* commit \u00271614843e93d98910147380969d034009ecb23aa2\u0027:\n Fix invalid comment in WebSettings.\n" }, { "commit": "fdbdeb3137a6b47527d1d714afbb7e1b19b474ec", "tree": "fd6d4abde1b3712c419bd1ea8193e51bc318153d", "parents": [ "1751086360056bc60d00f2ed2988bc82be9e7bd9" ], "author": { "name": "Derek Sollenberger", "email": "djsollen@google.com", "time": "Thu Aug 12 11:20:13 2010 -0400" }, "committer": { "name": "Derek Sollenberger", "email": "djsollen@google.com", "time": "Wed Sep 01 14:15:50 2010 -0400" }, "message": "Fix invalid comment in WebSettings.\n\nThe get/set for the pluginPath is leftover from the Gear\u0027s plugin\nand is no longer useful now that plugins are loaded from their\nown APK using the package manager. These methods were modified to\nbe no-ops in froyo, but the documentation was never completed.\n\nChange-Id: I20f6593445d877a3dae9b9f51d5198a3509255d6\nhttp://b/2811032\n" } ], "next": "fe026bdd3c0fd7543ceaf0732aeb824cfddb5b23" }