)]}' { "log": [ { "commit": "ae7ca4c32cb37ea82e77ad1462fbfcd4d6dfabd3", "tree": "e76e4f72db70f1d1291f6fa0ae334545906617c5", "parents": [ "e339c5edbebedf446581f18ad70214007309bf4b" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Sat May 15 13:05:04 2010 +0800" }, "committer": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Sat May 15 13:06:19 2010 +0800" }, "message": "Fix build error.\n\nOriginal name INFINITY conflicts with the macro in math.h.\n\nChange-Id: I9845ed84fca17813dd971239a902cc1e0bad1e3e\n" }, { "commit": "e339c5edbebedf446581f18ad70214007309bf4b", "tree": "7d03e881cb3e1300aef948eafb85396a58d38e1c", "parents": [ "aef87aa90cf3a6cf9098477683b07994697c45fe" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Thu May 13 19:31:02 2010 +0800" }, "committer": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Sat May 15 12:40:54 2010 +0800" }, "message": "Add camera focus distances API.\n\nApplications can use this API to estimate the distance\nbetween the subject and the camera.\n\nbug:1955650\nChange-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27\n" }, { "commit": "aef87aa90cf3a6cf9098477683b07994697c45fe", "tree": "8a31ae90d9c48912849534579b459992d343b3c7", "parents": [ "4606d5dd95b3dcf3a874f54e6d3d8d1ee95fcdca", "c6b7a2d704b6196c2f578302af607d58b0b85e4b" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 18:43:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 18:43:45 2010 -0700" }, "message": "am c6b7a2d7: am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.\n\nMerge commit \u0027c6b7a2d704b6196c2f578302af607d58b0b85e4b\u0027 into kraken\n\n* commit \u0027c6b7a2d704b6196c2f578302af607d58b0b85e4b\u0027:\n Doc change: add sizes/sums for sdk/ndk/adt packages.\n" }, { "commit": "c6b7a2d704b6196c2f578302af607d58b0b85e4b", "tree": "d8765df3ff8f172b1df66036acc0fa54190fa048", "parents": [ "a5cd816c720ed87b91a33aa5d000a0d308c74453", "d1e9d590941303c004459f3d798b26f1bf091535" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 18:42:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 18:42:11 2010 -0700" }, "message": "am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.\n\nMerge commit \u0027d1e9d590941303c004459f3d798b26f1bf091535\u0027 into froyo-plus-aosp\n\n* commit \u0027d1e9d590941303c004459f3d798b26f1bf091535\u0027:\n Doc change: add sizes/sums for sdk/ndk/adt packages.\n" }, { "commit": "4606d5dd95b3dcf3a874f54e6d3d8d1ee95fcdca", "tree": "842125fd1c897093f236329f2407381fc657091b", "parents": [ "5d75a181884ad8dbcdf238af422e5c38467b4410", "51c66aa4ce2797e21e880824e08de3b1228b3b0a" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri May 14 18:35:34 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 18:35:34 2010 -0700" }, "message": "Merge \"fix uninitialized variable in DisplayHardware\" into kraken" }, { "commit": "51c66aa4ce2797e21e880824e08de3b1228b3b0a", "tree": "aa072b9a1cee264d661fc1e6c75fbe1f0f2ed624", "parents": [ "d95266c6a8f059770b1799958530156a2f537468" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri May 14 18:33:30 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri May 14 18:33:30 2010 -0700" }, "message": "fix uninitialized variable in DisplayHardware\n\nthis fixes the issue where the display is all messed-up sometimes.\n\nChange-Id: I20be91b5166bfff0c6d353a777351842c9df8e95\n" }, { "commit": "d1e9d590941303c004459f3d798b26f1bf091535", "tree": "b2a494249913c151f1b6cd4af400a1a73ca5eb6a", "parents": [ "eb9128f9b0ee660504621381fd96f82d5bf8a3fd" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 18:14:42 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 18:14:42 2010 -0700" }, "message": "Doc change: add sizes/sums for sdk/ndk/adt packages.\n\nChange-Id: I9385c5b90a8f366764337adf4221fba4d7448568\n" }, { "commit": "5d75a181884ad8dbcdf238af422e5c38467b4410", "tree": "b3b87024417248de9bc53c167606b14facc2b482", "parents": [ "bfb776acf20652801b88a53f362cb4e0ac517515", "a5cd816c720ed87b91a33aa5d000a0d308c74453" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri May 14 16:30:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 16:30:29 2010 -0700" }, "message": "am a5cd816c: am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.\n\nMerge commit \u0027a5cd816c720ed87b91a33aa5d000a0d308c74453\u0027 into kraken\n\n* commit \u0027a5cd816c720ed87b91a33aa5d000a0d308c74453\u0027:\n Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.\n" }, { "commit": "a5cd816c720ed87b91a33aa5d000a0d308c74453", "tree": "643856ef97ff02e3709ba1c28a95c89776ffe271", "parents": [ "900b6157f5dee2ed7b2c73cf320b2baf293230ff", "eb9128f9b0ee660504621381fd96f82d5bf8a3fd" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri May 14 16:28:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 16:28:09 2010 -0700" }, "message": "am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.\n\nMerge commit \u0027eb9128f9b0ee660504621381fd96f82d5bf8a3fd\u0027 into froyo-plus-aosp\n\n* commit \u0027eb9128f9b0ee660504621381fd96f82d5bf8a3fd\u0027:\n Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.\n" }, { "commit": "eb9128f9b0ee660504621381fd96f82d5bf8a3fd", "tree": "828af137ce319ecb2fef1a45562bf6e63aa0c417", "parents": [ "826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri May 14 15:28:51 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri May 14 15:32:21 2010 -0700" }, "message": "Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.\n\nChange-Id: I576178144ffd753b809e1c4ae269ffc3aa34b511\nrelated-to-bug: 2686604\nQA-Impact: well, ..., everything related to streaming mpeg4/aac content over http\n" }, { "commit": "bfb776acf20652801b88a53f362cb4e0ac517515", "tree": "f48b9d737940bbef0a0419ff8d32ae94e3fa80eb", "parents": [ "7450c02a35d7c1f8580f906d6f1c1a11bc5c4fd0", "ce2cbe4c9605bfc4843968ff6e9746d23643f031" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri May 14 15:28:09 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 15:28:09 2010 -0700" }, "message": "Merge \"Get rid of warnings when compiled with -Wformat-security\" into kraken" }, { "commit": "7450c02a35d7c1f8580f906d6f1c1a11bc5c4fd0", "tree": "220d07ff6bd81691db9f8089e2f44c520845d9b5", "parents": [ "b42bc06675174d58dabc5efc032cfc43dac10393", "900b6157f5dee2ed7b2c73cf320b2baf293230ff" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 15:12:17 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 15:12:17 2010 -0700" }, "message": "am 900b6157: merge from open-source master\n\nMerge commit \u0027900b6157f5dee2ed7b2c73cf320b2baf293230ff\u0027 into kraken\n\n* commit \u0027900b6157f5dee2ed7b2c73cf320b2baf293230ff\u0027:\n Only hold a weak pointer on SurfaceComposerClients\n" }, { "commit": "900b6157f5dee2ed7b2c73cf320b2baf293230ff", "tree": "15fabaeae78d67b8ee40afa76c5fabff20582d2b", "parents": [ "fb580943133d3e9ad3e342b8038726b04686f283", "5b9fb5ab7ee81fc9b22f9aaea478db65e9b56c43" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 15:04:52 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 15:04:52 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd\n" }, { "commit": "b42bc06675174d58dabc5efc032cfc43dac10393", "tree": "00ef7b90836c669203dabf1f6293056dc1f7117f", "parents": [ "4d29493ea98d3eea459e6ed342ad3b6a484a9cba", "fb580943133d3e9ad3e342b8038726b04686f283" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri May 14 14:26:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 14:26:14 2010 -0700" }, "message": "am fb580943: am 826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide\n\nMerge commit \u0027fb580943133d3e9ad3e342b8038726b04686f283\u0027 into kraken\n\n* commit \u0027fb580943133d3e9ad3e342b8038726b04686f283\u0027:\n docs: fix broken link, reduce API info about backup and point to dev guide\n" }, { "commit": "fb580943133d3e9ad3e342b8038726b04686f283", "tree": "26754f0240b5fbae815d237e147faa09169499a7", "parents": [ "0d54b806c62cbe3ae71ce21f5d8bad78b0bee279", "826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri May 14 14:24:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 14:24:44 2010 -0700" }, "message": "am 826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide\n\nMerge commit \u0027826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49\u0027 into froyo-plus-aosp\n\n* commit \u0027826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49\u0027:\n docs: fix broken link, reduce API info about backup and point to dev guide\n" }, { "commit": "826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49", "tree": "ef268e1286a39c988d7ded7d94cb66f557feaa37", "parents": [ "60026c3ab0093e6d4cd464061ab9f36d4d041532" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri May 14 14:17:04 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri May 14 14:17:04 2010 -0700" }, "message": "docs: fix broken link, reduce API info about backup and point to dev guide\n\nChange-Id: If6470f1753917819e2f73fbba8947f082a26f720\n" }, { "commit": "4d29493ea98d3eea459e6ed342ad3b6a484a9cba", "tree": "dc6a4854e8a4e0a131dd1e91c6f88fedb93894a9", "parents": [ "12b6f6eaee7e92b80d04eb3b6387a08454007b8d", "0d54b806c62cbe3ae71ce21f5d8bad78b0bee279" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 14:01:59 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 14:01:59 2010 -0700" }, "message": "am 0d54b806: am 60026c3a: Merge \"Doc change: adjust compatibility doc.\" into froyo\n\nMerge commit \u00270d54b806c62cbe3ae71ce21f5d8bad78b0bee279\u0027 into kraken\n\n* commit \u00270d54b806c62cbe3ae71ce21f5d8bad78b0bee279\u0027:\n Doc change: adjust compatibility doc.\n" }, { "commit": "0d54b806c62cbe3ae71ce21f5d8bad78b0bee279", "tree": "640d87546622c89ecdcc8b928c75ce1f5b499554", "parents": [ "55b7d1243f15395a102971e8fdc57444638729ac", "60026c3ab0093e6d4cd464061ab9f36d4d041532" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 14:00:12 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 14:00:12 2010 -0700" }, "message": "am 60026c3a: Merge \"Doc change: adjust compatibility doc.\" into froyo\n\nMerge commit \u002760026c3ab0093e6d4cd464061ab9f36d4d041532\u0027 into froyo-plus-aosp\n\n* commit \u002760026c3ab0093e6d4cd464061ab9f36d4d041532\u0027:\n Doc change: adjust compatibility doc.\n" }, { "commit": "60026c3ab0093e6d4cd464061ab9f36d4d041532", "tree": "30414eb9d862ca5ed30f5d849d0c253be8512730", "parents": [ "59cfe7137ca411bdbb5ffcdf418eecc55d65d09e", "51d812b83b75634235ee5fb70c6295a356d538eb" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:58:12 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 13:58:12 2010 -0700" }, "message": "Merge \"Doc change: adjust compatibility doc.\" into froyo" }, { "commit": "12b6f6eaee7e92b80d04eb3b6387a08454007b8d", "tree": "488614969774764bf493787aec65b91cd0153967", "parents": [ "ad8ce5346a3c5ac6d29246373bf129f9d6567d9f", "55b7d1243f15395a102971e8fdc57444638729ac" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 13:54:56 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 13:54:56 2010 -0700" }, "message": "am 55b7d124: merge from open-source master\n\nMerge commit \u002755b7d1243f15395a102971e8fdc57444638729ac\u0027 into kraken\n\n* commit \u002755b7d1243f15395a102971e8fdc57444638729ac\u0027:\n SetLocaleByCarrier, only if its not an unknown carrier.\n" }, { "commit": "55b7d1243f15395a102971e8fdc57444638729ac", "tree": "1dfc4a8feb15fceb73562aa14c7f641336314b92", "parents": [ "3d52305faa682366eb34c30892ddd2b390940048", "a2adf8f394bd568b6108fe989b0ac0ca2072670d" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 13:52:52 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 13:52:52 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38\n" }, { "commit": "51d812b83b75634235ee5fb70c6295a356d538eb", "tree": "eef3bef9c45640dc36ef38ffe65c92218bafb7ba", "parents": [ "fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:52:30 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:52:30 2010 -0700" }, "message": "Doc change: adjust compatibility doc.\n\nChange-Id: I74f9fba81de4d358ecccfe1ef0c69f0e83e1a7c5\n" }, { "commit": "ad8ce5346a3c5ac6d29246373bf129f9d6567d9f", "tree": "e320bbf224b20b946e99417ccd778c0ec97ac24f", "parents": [ "8072bdc6e217f9a1f20437fb39f655088f01eae5", "3d52305faa682366eb34c30892ddd2b390940048" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:49:56 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 13:49:56 2010 -0700" }, "message": "am 3d52305f: am 59cfe713: Merge \"Doc change: adjustments to the api changes description\" into froyo\n\nMerge commit \u00273d52305faa682366eb34c30892ddd2b390940048\u0027 into kraken\n\n* commit \u00273d52305faa682366eb34c30892ddd2b390940048\u0027:\n Doc change: adjustments to the api changes description\n" }, { "commit": "3d52305faa682366eb34c30892ddd2b390940048", "tree": "0adf8e712134f9948effd5408721d10b91454e94", "parents": [ "cae9cfeed7b0895189e08a4fadf63c917b1aec7b", "59cfe7137ca411bdbb5ffcdf418eecc55d65d09e" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:48:04 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 13:48:04 2010 -0700" }, "message": "am 59cfe713: Merge \"Doc change: adjustments to the api changes description\" into froyo\n\nMerge commit \u002759cfe7137ca411bdbb5ffcdf418eecc55d65d09e\u0027 into froyo-plus-aosp\n\n* commit \u002759cfe7137ca411bdbb5ffcdf418eecc55d65d09e\u0027:\n Doc change: adjustments to the api changes description\n" }, { "commit": "8072bdc6e217f9a1f20437fb39f655088f01eae5", "tree": "219a1e36bd926650ff49a12c57da40bdd5fe44ef", "parents": [ "41a450cd8e0c975bb394999b27b843992d39bc7b", "cae9cfeed7b0895189e08a4fadf63c917b1aec7b" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:47:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 13:47:07 2010 -0700" }, "message": "am cae9cfee: am bba70cdb: Merge \"Doc change: add note about future instruction set support.\" into froyo\n\nMerge commit \u0027cae9cfeed7b0895189e08a4fadf63c917b1aec7b\u0027 into kraken\n\n* commit \u0027cae9cfeed7b0895189e08a4fadf63c917b1aec7b\u0027:\n Doc change: add note about future instruction set support.\n" }, { "commit": "59cfe7137ca411bdbb5ffcdf418eecc55d65d09e", "tree": "65c775e6b159e304098e706306005ce3136039e3", "parents": [ "bba70cdba284c3d76cab9843e44097d664882938", "877fb9a2cbd577cc62549cd9580f2d1e34197a6d" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:46:42 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 13:46:42 2010 -0700" }, "message": "Merge \"Doc change: adjustments to the api changes description\" into froyo" }, { "commit": "877fb9a2cbd577cc62549cd9580f2d1e34197a6d", "tree": "b0162abcb954e03f36614611089cd82ebbe53997", "parents": [ "fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Thu May 13 22:05:56 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:45:27 2010 -0700" }, "message": "Doc change: adjustments to the api changes description\n\nChange-Id: I9373b424ae008face124e38a163c980608c2e4df\n" }, { "commit": "cae9cfeed7b0895189e08a4fadf63c917b1aec7b", "tree": "e1ea681c757f8cf1ea7992af60a077db7b5f0f1e", "parents": [ "bf4cecd2822ff74c8c246d2595a836b5f1130ad8", "bba70cdba284c3d76cab9843e44097d664882938" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:45:17 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 13:45:17 2010 -0700" }, "message": "am bba70cdb: Merge \"Doc change: add note about future instruction set support.\" into froyo\n\nMerge commit \u0027bba70cdba284c3d76cab9843e44097d664882938\u0027 into froyo-plus-aosp\n\n* commit \u0027bba70cdba284c3d76cab9843e44097d664882938\u0027:\n Doc change: add note about future instruction set support.\n" }, { "commit": "bba70cdba284c3d76cab9843e44097d664882938", "tree": "05e012a445599871ab3ed05c5e92b2b7c458bc8a", "parents": [ "89969d4cdaf7abbbf6d3fce86c274e7b79113e8d", "de98f6e39788b929f28dd44a55c2ffb48d59f32d" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:43:19 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 13:43:19 2010 -0700" }, "message": "Merge \"Doc change: add note about future instruction set support.\" into froyo" }, { "commit": "41a450cd8e0c975bb394999b27b843992d39bc7b", "tree": "63a0cc6daafd518903e85143d7e1cde6aecaa1dd", "parents": [ "d95266c6a8f059770b1799958530156a2f537468", "bf4cecd2822ff74c8c246d2595a836b5f1130ad8" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:41:46 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 13:41:46 2010 -0700" }, "message": "am bf4cecd2: am 89969d4c: Merge \"Doc change: documentation for library projects in sdk.\" into froyo\n\nMerge commit \u0027bf4cecd2822ff74c8c246d2595a836b5f1130ad8\u0027 into kraken\n\n* commit \u0027bf4cecd2822ff74c8c246d2595a836b5f1130ad8\u0027:\n Doc change: documentation for library projects in sdk.\n" }, { "commit": "bf4cecd2822ff74c8c246d2595a836b5f1130ad8", "tree": "598999cc504bd291060cc3b326b8136db53061df", "parents": [ "6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf", "89969d4cdaf7abbbf6d3fce86c274e7b79113e8d" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:40:19 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 13:40:19 2010 -0700" }, "message": "am 89969d4c: Merge \"Doc change: documentation for library projects in sdk.\" into froyo\n\nMerge commit \u002789969d4cdaf7abbbf6d3fce86c274e7b79113e8d\u0027 into froyo-plus-aosp\n\n* commit \u002789969d4cdaf7abbbf6d3fce86c274e7b79113e8d\u0027:\n Doc change: documentation for library projects in sdk.\n" }, { "commit": "5b9fb5ab7ee81fc9b22f9aaea478db65e9b56c43", "tree": "a27c99783533f0a4c53d0b5273984fc925981111", "parents": [ "a2adf8f394bd568b6108fe989b0ac0ca2072670d", "d0964b3fdf546cdd00a319072353818ed8d56f08" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri May 14 13:39:48 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Fri May 14 13:39:48 2010 -0700" }, "message": "Merge \"Only hold a weak pointer on SurfaceComposerClients\"" }, { "commit": "89969d4cdaf7abbbf6d3fce86c274e7b79113e8d", "tree": "b99e241b18919c96f878831fe011486ae9018a22", "parents": [ "b83a283ac178ab0a72f1d811189d79b26097835e", "a3245648d617dfad7b6d37e395177ab935476e74" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:38:20 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 13:38:20 2010 -0700" }, "message": "Merge \"Doc change: documentation for library projects in sdk.\" into froyo" }, { "commit": "de98f6e39788b929f28dd44a55c2ffb48d59f32d", "tree": "30a4638a833d6a4b5f3f4a0102146c48f6cc7ad8", "parents": [ "fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Thu May 13 22:19:10 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:37:01 2010 -0700" }, "message": "Doc change: add note about future instruction set support.\n\nChange-Id: If954c1020301f5935c8d9328a531afdddbdad8db\n" }, { "commit": "a3245648d617dfad7b6d37e395177ab935476e74", "tree": "cc15178b9d74b66358abfa30e94e76f1f49bacb2", "parents": [ "c928a11e34678296511d5ea34582292be7368618" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Tue May 11 19:09:53 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 14 13:27:39 2010 -0700" }, "message": "Doc change: documentation for library projects in sdk.\n\nChange-Id: I615d24a046ba2858676e985072563cc90a906551\n" }, { "commit": "d95266c6a8f059770b1799958530156a2f537468", "tree": "8db7bf2b3debc962f523ea27b7767ff518ced759", "parents": [ "4e544e81462cb47d237af916850983412c77975a", "68510e60f9671ee08f3cc18bd93400cafb7703bb" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri May 14 12:19:17 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 12:19:17 2010 -0700" }, "message": "Merge \"Detect and handle premature termination of a recording session\" into kraken" }, { "commit": "4e544e81462cb47d237af916850983412c77975a", "tree": "692317035880f5dd034131521906cf5d5b7633c3", "parents": [ "29f5d9b61da0f496fc243edfc838f09a9b5c6eaf", "942a2fbfdfbc61a48ed60984ff52c988dcbf5fa1" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri May 14 12:07:05 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 12:07:05 2010 -0700" }, "message": "Merge \"Forgot to fix one -Wformat-security in my previous change. Fixed.\" into kraken" }, { "commit": "29f5d9b61da0f496fc243edfc838f09a9b5c6eaf", "tree": "f6e4bbf707f7a79ad77cda3f471336a6babe4f78", "parents": [ "6c034325a856f4cfb1e8b5bc97adbc7f9dffd0a2", "553447b8ff949618f299bba38ef04c2b6740f1d3" ], "author": { "name": "Chih-Chung Chang", "email": "chihchung@google.com", "time": "Fri May 14 12:05:06 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 12:05:06 2010 -0700" }, "message": "Merge \"Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()\" into kraken" }, { "commit": "6c034325a856f4cfb1e8b5bc97adbc7f9dffd0a2", "tree": "e8c6b37d912c83c1b31052f222e3515c1e1fc6d9", "parents": [ "f55e322216c816d7876ca98521497c58520ebf08", "6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri May 14 11:56:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 11:56:14 2010 -0700" }, "message": "am 6d8e4fd8: am b83a283a: docs: add dev guide for backup\n\nMerge commit \u00276d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf\u0027 into kraken\n\n* commit \u00276d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf\u0027:\n docs: add dev guide for backup\n" }, { "commit": "6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf", "tree": "31c685875b77cc6af10472e9af9870f60032effe", "parents": [ "1d628c5d3dd7998b29c339292a2dc391015d0782", "b83a283ac178ab0a72f1d811189d79b26097835e" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri May 14 11:53:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 11:53:44 2010 -0700" }, "message": "am b83a283a: docs: add dev guide for backup\n\nMerge commit \u0027b83a283ac178ab0a72f1d811189d79b26097835e\u0027 into froyo-plus-aosp\n\n* commit \u0027b83a283ac178ab0a72f1d811189d79b26097835e\u0027:\n docs: add dev guide for backup\n" }, { "commit": "f55e322216c816d7876ca98521497c58520ebf08", "tree": "ae33e39cf06ec0fbefd8a68b491bd14536ab9e3c", "parents": [ "9db798d0f07213071a65237e9ece758c9e8c7b99", "f75e370e127b7c7bb6b6d5cebaa07abec36794b2" ], "author": { "name": "Ray Chen", "email": "raychen@google.com", "time": "Fri May 14 11:48:45 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 11:48:45 2010 -0700" }, "message": "Merge \"Fix issue 2622023 Clean up all hardcoded \u0027/sdcard\u0027 in camera related codes.\" into kraken" }, { "commit": "68510e60f9671ee08f3cc18bd93400cafb7703bb", "tree": "87e2862b5d039f0e6211b891527e50f561b9013f", "parents": [ "9db798d0f07213071a65237e9ece758c9e8c7b99" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri May 14 11:48:00 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri May 14 11:48:00 2010 -0700" }, "message": "Detect and handle premature termination of a recording session\n\nChange-Id: Ifb83b19f3e68580345b23efed5d5956fb81baeb8\n" }, { "commit": "b83a283ac178ab0a72f1d811189d79b26097835e", "tree": "2be72c9a1ca56ea65b6f35608c867bf8c21a79af", "parents": [ "fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Thu Apr 29 13:26:53 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Fri May 14 11:47:42 2010 -0700" }, "message": "docs: add dev guide for backup\n\nChange-Id: I168f6b15d3441c9cbea2cd9699612476c7244530\n" }, { "commit": "f75e370e127b7c7bb6b6d5cebaa07abec36794b2", "tree": "3ccc97fbbe094ffa833410b3f379d396d75c16dc", "parents": [ "5eb01a57e87091b3af2bbd167d7b7a3a8871534c" ], "author": { "name": "Ray Chen", "email": "raychen@google.com", "time": "Fri Apr 30 14:11:52 2010 -0700" }, "committer": { "name": "Ray Chen", "email": "raychen@google.com", "time": "Fri May 14 11:43:38 2010 -0700" }, "message": "Fix issue 2622023 Clean up all hardcoded \u0027/sdcard\u0027 in camera related codes.\n\nChange-Id: I8a509d957a7b67ee1f59dc4ef5139c4e28adeb9c\n" }, { "commit": "a2adf8f394bd568b6108fe989b0ac0ca2072670d", "tree": "64e94fe4aeca5538b319a27355c87208370c2aa0", "parents": [ "75e181b633ec94dde4a5a62d28040289ad645e74", "eccd93c7eb8d31f71023f9d32cf0fb40bb097fa6" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri May 14 11:39:06 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Fri May 14 11:39:06 2010 -0700" }, "message": "Merge \"SetLocaleByCarrier, only if its not an unknown carrier.\"" }, { "commit": "9db798d0f07213071a65237e9ece758c9e8c7b99", "tree": "958d31370beae905336906f7171047968dfc7d01", "parents": [ "1824486e044f4f09640fbd7bef74a20e4efb35ae" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 13 11:47:36 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri May 14 10:51:12 2010 -0700" }, "message": "Audio/video initial recording time synchronization\n\nChange-Id: Iac58b63d474fe09c1d36ba6ecde91dafbb7fef9a\n" }, { "commit": "1824486e044f4f09640fbd7bef74a20e4efb35ae", "tree": "88f56b045e6ec380d4353797ab0fa758425fa53f", "parents": [ "21a534d955c8d45c50dafaf05cf2afbb8cf3696c" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue May 11 14:57:02 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri May 14 10:46:56 2010 -0700" }, "message": "Handle recording file size and/or duration limit\n\nChange-Id: Ib9ed1f3ebd8fef550cc130a7ef11f2905fa9aedc\n" }, { "commit": "942a2fbfdfbc61a48ed60984ff52c988dcbf5fa1", "tree": "1066ae955014028810869f902f401b4203e2e859", "parents": [ "21a534d955c8d45c50dafaf05cf2afbb8cf3696c" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri May 14 10:29:13 2010 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri May 14 10:29:13 2010 -0700" }, "message": "Forgot to fix one -Wformat-security in my previous change. Fixed.\n\nChange-Id: Ice7459b30e1d7dbfe400b68d27ebc04fcca78bae\n" }, { "commit": "21a534d955c8d45c50dafaf05cf2afbb8cf3696c", "tree": "98cc6ff98a60eef761cb64e9acc157e8fb2ee204", "parents": [ "9f0810e8c72cf3c694a5f1cf608b26ed490d9bd6", "1d628c5d3dd7998b29c339292a2dc391015d0782" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 09:46:11 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 09:46:11 2010 -0700" }, "message": "am 1d628c5d: merge from open-source master\n\nMerge commit \u00271d628c5d3dd7998b29c339292a2dc391015d0782\u0027 into kraken\n\n* commit \u00271d628c5d3dd7998b29c339292a2dc391015d0782\u0027:\n Accept media files by file extension in case insensitive manner.\n" }, { "commit": "1d628c5d3dd7998b29c339292a2dc391015d0782", "tree": "e520df875144c2c0c824d4d5a858a2acc31df566", "parents": [ "9167ba50e4d7e08e02119d9c4a0f0392296cc3f1", "75e181b633ec94dde4a5a62d28040289ad645e74" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 09:44:36 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 09:44:36 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4\n" }, { "commit": "9f0810e8c72cf3c694a5f1cf608b26ed490d9bd6", "tree": "e4607200508331cd678433757db186e593993fc0", "parents": [ "ead68d5cd6126ad4a686e33342005db114ab18fe", "b0a0147f344a2d26d86be2b1bdf5bfde50ef86c2" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 14 09:39:12 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 09:39:12 2010 -0700" }, "message": "Merge \"AudioFlinger: rename variables to clarify reference to track channel count or channel mask\" into kraken" }, { "commit": "ead68d5cd6126ad4a686e33342005db114ab18fe", "tree": "f55a54b413cb1c6a8e87b7cac5fd3bdbf9130f49", "parents": [ "db20eeb2463d077df32dd726b1fe2c76fbfd1077", "ef8a3ed1b8dfcba1cd77c4c105aabfa4f5b2e467" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri May 14 09:32:45 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 14 09:32:45 2010 -0700" }, "message": "Merge \"Remove libdrm2. This code appears to be unused.\" into kraken" }, { "commit": "db20eeb2463d077df32dd726b1fe2c76fbfd1077", "tree": "e731cd0d7bbe01d820022022ed58f7fddc11a81d", "parents": [ "1e4dc54d56b0a2289c5bba33281e6578bda005e0", "9167ba50e4d7e08e02119d9c4a0f0392296cc3f1" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 09:15:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri May 14 09:15:41 2010 -0700" }, "message": "am 9167ba50: merge from open-source master\n\nMerge commit \u00279167ba50e4d7e08e02119d9c4a0f0392296cc3f1\u0027 into kraken\n\n* commit \u00279167ba50e4d7e08e02119d9c4a0f0392296cc3f1\u0027:\n Corrected debug message in WindowManager\n Put the wifi status icon in the right place.\n" }, { "commit": "9167ba50e4d7e08e02119d9c4a0f0392296cc3f1", "tree": "3798d0dac82caf45935a6e03a8a5948e7d9c6108", "parents": [ "d48e0382c3db1827ccb79fe912d271d426dd46ad", "1b44ebda7062e204993e930cf073130ce8799f62" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 09:11:31 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Fri May 14 09:11:31 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226\n" }, { "commit": "1e4dc54d56b0a2289c5bba33281e6578bda005e0", "tree": "52caac41af5d6eb2903a31289e98f794e10168e0", "parents": [ "bfcbd9a9e1bc3a8d721e906e4c621f85104c7d93" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu May 13 15:09:03 2010 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Fri May 14 09:06:55 2010 -0700" }, "message": "Get rid of warnings when compiled with -Wformat-security\n\nChange-Id: Ibd814d894ff0eba26b01932b9865098b7bb26f95\n" }, { "commit": "75e181b633ec94dde4a5a62d28040289ad645e74", "tree": "ff83aec67782f1e5be42694cfbb1aa5c883a9ab8", "parents": [ "1b44ebda7062e204993e930cf073130ce8799f62", "ebcc51d39c340f6fdafa828bb0fe715ffaa8658d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri May 14 09:06:43 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Fri May 14 09:06:43 2010 -0700" }, "message": "Merge \"Accept media files by file extension in case insensitive manner.\"" }, { "commit": "b0a0147f344a2d26d86be2b1bdf5bfde50ef86c2", "tree": "8820f5f5979f699ef5903fe65f4fe3541bff5371", "parents": [ "bfcbd9a9e1bc3a8d721e906e4c621f85104c7d93" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 14 05:45:46 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri May 14 05:45:46 2010 -0700" }, "message": "AudioFlinger: rename variables to clarify reference to track channel count or channel mask\n\nSome variables and structure members should be renamed to reflect the fact that they contain the\nnumber of channels in a track (channel count) or the actual channels used by a track (channel mask).\nEspecially member \"channels\" of track control block (struct audio_track_cblk_t) is actually the\nnumber of channels (channels count).\n\nChange-Id: I220c8dede9fc00c8a5693389e790073b6ed307b8\n" }, { "commit": "bfcbd9a9e1bc3a8d721e906e4c621f85104c7d93", "tree": "4d5681e965225422ca8d44f2e63d03c3a9e3334c", "parents": [ "d91ac162d196a232d3cec58a8486384eaa8847c3", "d48e0382c3db1827ccb79fe912d271d426dd46ad" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Thu May 13 21:34:31 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 21:34:31 2010 -0700" }, "message": "am d48e0382: am fb473bb6: Merge \"Doc change: adjustments for ndk feature description\" into froyo\n\nMerge commit \u0027d48e0382c3db1827ccb79fe912d271d426dd46ad\u0027 into kraken\n\n* commit \u0027d48e0382c3db1827ccb79fe912d271d426dd46ad\u0027:\n Doc change: adjustments for ndk feature description\n" }, { "commit": "d48e0382c3db1827ccb79fe912d271d426dd46ad", "tree": "6d69c261af6dd03c80fae56a51c56079d81ce176", "parents": [ "d317edabe158312981eb73355f77c36566d89627", "fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Thu May 13 21:32:21 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 21:32:21 2010 -0700" }, "message": "am fb473bb6: Merge \"Doc change: adjustments for ndk feature description\" into froyo\n\nMerge commit \u0027fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60\u0027 into froyo-plus-aosp\n\n* commit \u0027fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60\u0027:\n Doc change: adjustments for ndk feature description\n" }, { "commit": "fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60", "tree": "d831d414e427d6e76c2314f1d29e004e0efc5c54", "parents": [ "a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99", "346930b74db69e0d3a248f5837fd604cd23a1cef" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Thu May 13 21:31:10 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 13 21:31:10 2010 -0700" }, "message": "Merge \"Doc change: adjustments for ndk feature description\" into froyo" }, { "commit": "346930b74db69e0d3a248f5837fd604cd23a1cef", "tree": "fb92e0e1b65df8223e781496997c203f9ceecd47", "parents": [ "c928a11e34678296511d5ea34582292be7368618" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Thu May 13 21:28:45 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Thu May 13 21:28:45 2010 -0700" }, "message": "Doc change: adjustments for ndk feature description\n\nChange-Id: I3eb35c3d5ad756b7fa71c256b531f262e7940d90\n" }, { "commit": "d91ac162d196a232d3cec58a8486384eaa8847c3", "tree": "269bc54aad32c58aff4d7c7498d3934964f4d5a8", "parents": [ "ffd104a903651ca1c64e662df8465c9490da4144", "d317edabe158312981eb73355f77c36566d89627" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Thu May 13 21:28:34 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 21:28:34 2010 -0700" }, "message": "am d317edab: am a0711e7b: Doc change: Add compatibility article.\n\nMerge commit \u0027d317edabe158312981eb73355f77c36566d89627\u0027 into kraken\n\n* commit \u0027d317edabe158312981eb73355f77c36566d89627\u0027:\n Doc change: Add compatibility article.\n" }, { "commit": "d317edabe158312981eb73355f77c36566d89627", "tree": "43d7de25ce48d6404973e89c9d66fa81503f6f17", "parents": [ "b63ea5f784b7862a7ab28e0134f6da47f6275810", "a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Thu May 13 21:26:22 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 21:26:22 2010 -0700" }, "message": "am a0711e7b: Doc change: Add compatibility article.\n\nMerge commit \u0027a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99\u0027 into froyo-plus-aosp\n\n* commit \u0027a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99\u0027:\n Doc change: Add compatibility article.\n" }, { "commit": "a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99", "tree": "d54655e30ea54530aa2460fb36a6e2ad791ef7f0", "parents": [ "c928a11e34678296511d5ea34582292be7368618" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Fri May 07 15:14:56 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Thu May 13 21:22:44 2010 -0700" }, "message": "Doc change: Add compatibility article.\n\nChange-Id: Ie6671813eb88bc8cb92575726f8fcf69eb558d08\n" }, { "commit": "553447b8ff949618f299bba38ef04c2b6740f1d3", "tree": "0b9f8777a5f5253525318cbe58514c3103117571", "parents": [ "ffd104a903651ca1c64e662df8465c9490da4144" ], "author": { "name": "Chih-Chung Chang", "email": "chihchung@google.com", "time": "Thu May 13 15:14:24 2010 +0800" }, "committer": { "name": "Chih-Chung Chang", "email": "chihchung@google.com", "time": "Fri May 14 11:34:20 2010 +0800" }, "message": "Fix deadlock if the last reference of ICameraClient is removed in\nICamera::connect()\n\nChange-Id: I34ab3e4f07435c62168175e9bb159022c8fb99f4\n" }, { "commit": "ffd104a903651ca1c64e662df8465c9490da4144", "tree": "f3d0adba1b430972e9bcd871ab642ca1b2a9983d", "parents": [ "3f5ed04f7f594efe401f2a9f7828343920723b4b", "e292b3bc9c28e47bb8411728ad40efb84d0471e8" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 13 16:40:19 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 13 16:40:19 2010 -0700" }, "message": "Merge \"Remove dummy surface in CameraSource\" into kraken" }, { "commit": "1b44ebda7062e204993e930cf073130ce8799f62", "tree": "f05b2d7a1f585c3f646d239d2edb2c44cdcc88d2", "parents": [ "08d842abc2f5eab2c1cdae1a5808fbd3d8e0ba9c", "14f190e1252006711044ebb3cafa1345e2852d30" ], "author": { "name": "Joe Onorato", "email": "joeo@android.com", "time": "Thu May 13 16:33:22 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Thu May 13 16:33:22 2010 -0700" }, "message": "Merge \"Put the wifi status icon in the right place.\"" }, { "commit": "3f5ed04f7f594efe401f2a9f7828343920723b4b", "tree": "9af8d5f0e186c335ea829883cd5d339cbd6c3cc8", "parents": [ "cf67d18a1d5e6e89b96f7750706cb36208ddb936", "b63ea5f784b7862a7ab28e0134f6da47f6275810" ], "author": { "name": "Suchi Amalapurapu", "email": "asuchitra@google.com", "time": "Thu May 13 16:05:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 16:05:54 2010 -0700" }, "message": "am b63ea5f7: am c928a11e: Merge \"Fix 2672155 Check the code path when enabling disabling packages.\" into froyo\n\nMerge commit \u0027b63ea5f784b7862a7ab28e0134f6da47f6275810\u0027 into kraken\n\n* commit \u0027b63ea5f784b7862a7ab28e0134f6da47f6275810\u0027:\n Fix 2672155\n" }, { "commit": "b63ea5f784b7862a7ab28e0134f6da47f6275810", "tree": "f6db6b3766b7970dfe00c4733a0fd336aa8b64b9", "parents": [ "b1110149cccc3b99e59ead34ca46e5ac026f6db9", "c928a11e34678296511d5ea34582292be7368618" ], "author": { "name": "Suchi Amalapurapu", "email": "asuchitra@google.com", "time": "Thu May 13 16:04:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 16:04:24 2010 -0700" }, "message": "am c928a11e: Merge \"Fix 2672155 Check the code path when enabling disabling packages.\" into froyo\n\nMerge commit \u0027c928a11e34678296511d5ea34582292be7368618\u0027 into froyo-plus-aosp\n\n* commit \u0027c928a11e34678296511d5ea34582292be7368618\u0027:\n Fix 2672155\n" }, { "commit": "c928a11e34678296511d5ea34582292be7368618", "tree": "a56d14d9dbd805be1383678a6137693bf8518237", "parents": [ "098e58da93f304d7d7791f193c6237870b94989d", "1ace5bc070b7271a3f5835b13e326875785f718c" ], "author": { "name": "Suchi Amalapurapu", "email": "asuchitra@google.com", "time": "Thu May 13 16:02:20 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 13 16:02:20 2010 -0700" }, "message": "Merge \"Fix 2672155 Check the code path when enabling disabling packages.\" into froyo" }, { "commit": "1ace5bc070b7271a3f5835b13e326875785f718c", "tree": "8eece8ed8afee9b9c789a5d1c9a642ba838827f6", "parents": [ "3c78a1b58957e31d2991fb6a609abecbb1987b3b" ], "author": { "name": "Suchi Amalapurapu", "email": "asuchitra@google.com", "time": "Thu May 13 12:05:53 2010 -0700" }, "committer": { "name": "Suchi Amalapurapu", "email": "asuchitra@google.com", "time": "Thu May 13 15:48:39 2010 -0700" }, "message": "Fix 2672155\nCheck the code path when enabling disabling packages.\n\nAdd unit test\n\nChange-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e\n" }, { "commit": "cf67d18a1d5e6e89b96f7750706cb36208ddb936", "tree": "4d0d9cf54f3af78c573083a4550ff56a23298888", "parents": [ "e28776bbd72397eea0dd24f5c28273fb2bf1a2f0", "79290ae9768b69197dcc5f3645910b67925c0f95" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu May 13 15:35:48 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 13 15:35:48 2010 -0700" }, "message": "Merge \"Get rid of warnings when compiled with -Wformat-security\" into kraken" }, { "commit": "79290ae9768b69197dcc5f3645910b67925c0f95", "tree": "56b7e8f5fcc89d92343eade62e4f0b6fbb2c3c19", "parents": [ "8b518577ceba9746fe5566274bd9deb09d450779" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu May 13 15:31:00 2010 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu May 13 15:31:00 2010 -0700" }, "message": "Get rid of warnings when compiled with -Wformat-security\n\nChange-Id: I5a7ad5be2aaf0fa0d164204d3c1bebf02ec55745\n" }, { "commit": "e28776bbd72397eea0dd24f5c28273fb2bf1a2f0", "tree": "b89399e174fa0d02011f98def0cb612d8c1dcc0b", "parents": [ "5a9cbb291fa7505a6c51eba6f600009dfc17366d", "b1110149cccc3b99e59ead34ca46e5ac026f6db9" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu May 13 14:56:02 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 14:56:02 2010 -0700" }, "message": "am b1110149: merge from open-source master\n\nMerge commit \u0027b1110149cccc3b99e59ead34ca46e5ac026f6db9\u0027 into kraken\n\n* commit \u0027b1110149cccc3b99e59ead34ca46e5ac026f6db9\u0027:\n Use integer for loop counter instead of float\n New test in FrameworkTest for the VelocityTracker class\n Preserve \u0027+\u0027 in phone numbers imported from SIM.\n" }, { "commit": "b1110149cccc3b99e59ead34ca46e5ac026f6db9", "tree": "53f282b539ba34e787cc11eeab7b7b829c0145a5", "parents": [ "a3d5549c802bc4fbf1e1ca05bc3552db17212036", "b79781af1ebc68dbaa1b44da43fd391de067a201" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu May 13 14:50:16 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu May 13 14:50:16 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8\n" }, { "commit": "ce2cbe4c9605bfc4843968ff6e9746d23643f031", "tree": "9c9fea0a2960c9975b48bf45d3f95dd7fde364b1", "parents": [ "8b518577ceba9746fe5566274bd9deb09d450779" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu May 13 14:46:27 2010 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu May 13 14:46:27 2010 -0700" }, "message": "Get rid of warnings when compiled with -Wformat-security\n\nChange-Id: I63c3bf786bbe7a0276624e71a4ba80c4a9aaa4bb\n" }, { "commit": "5a9cbb291fa7505a6c51eba6f600009dfc17366d", "tree": "366967965e321597c96e9ffc9e81a6c3bab96016", "parents": [ "54a8f2952341e39685c920e9be43e57d33e4b01b", "a3d5549c802bc4fbf1e1ca05bc3552db17212036" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu May 13 14:06:25 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 14:06:25 2010 -0700" }, "message": "am a3d5549c: am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic\n\nMerge commit \u0027a3d5549c802bc4fbf1e1ca05bc3552db17212036\u0027 into kraken\n\n* commit \u0027a3d5549c802bc4fbf1e1ca05bc3552db17212036\u0027:\n Use SystemClock.elapsedRealtime in ShutdownThread timeout logic\n" }, { "commit": "a3d5549c802bc4fbf1e1ca05bc3552db17212036", "tree": "1d51c3ff74b2419ac62f47946e2943e016d2aef5", "parents": [ "28fadef2ede2d74e9526266e779553bbd1dc66f4", "098e58da93f304d7d7791f193c6237870b94989d" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu May 13 14:04:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 14:04:30 2010 -0700" }, "message": "am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic\n\nMerge commit \u0027098e58da93f304d7d7791f193c6237870b94989d\u0027 into froyo-plus-aosp\n\n* commit \u0027098e58da93f304d7d7791f193c6237870b94989d\u0027:\n Use SystemClock.elapsedRealtime in ShutdownThread timeout logic\n" }, { "commit": "098e58da93f304d7d7791f193c6237870b94989d", "tree": "deaf00aa824850812a1560180fb13118c4e441fc", "parents": [ "3c78a1b58957e31d2991fb6a609abecbb1987b3b" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu May 13 16:29:49 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu May 13 16:29:49 2010 -0400" }, "message": "Use SystemClock.elapsedRealtime in ShutdownThread timeout logic\n\nThis avoids problems if the time is reset while shutting down.\n\nChange-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "08d842abc2f5eab2c1cdae1a5808fbd3d8e0ba9c", "tree": "d36e3100ba35f528a0cf4993ed61a9d33fbd77b9", "parents": [ "b79781af1ebc68dbaa1b44da43fd391de067a201", "6c3da7fbc21fa8978c6f7b703ec87874d53ec760" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@android.com", "time": "Thu May 13 13:25:16 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Thu May 13 13:25:16 2010 -0700" }, "message": "Merge \"Corrected debug message in WindowManager\"" }, { "commit": "54a8f2952341e39685c920e9be43e57d33e4b01b", "tree": "486555f0252603d257635446aee3b494a4026a32", "parents": [ "fae47fd008974fb78f38ae4a6d539cd8246d3159", "ba2593a424a8d765909419e7903e4a6a454d1581" ], "author": { "name": "Jaikumar Ganesh", "email": "jaikumar@google.com", "time": "Thu May 13 12:20:06 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 13 12:20:06 2010 -0700" }, "message": "Merge \"Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING.\" into kraken" }, { "commit": "b79781af1ebc68dbaa1b44da43fd391de067a201", "tree": "d450bbeab60f1cdd02ff1c80d8ac8f76b4896f25", "parents": [ "9ef0f0d9d2fa9ebc2eed0965f8910252720bfd87" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu May 13 12:15:09 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu May 13 12:17:15 2010 -0700" }, "message": "Use integer for loop counter instead of float\n\nChange-Id: Iafaccbb3a3a7cbe0d67ed6827906d713c37ce89b\n" }, { "commit": "ef8a3ed1b8dfcba1cd77c4c105aabfa4f5b2e467", "tree": "70aa3717cda854bf6f169db4c9c420b2eca960a0", "parents": [ "8b518577ceba9746fe5566274bd9deb09d450779" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu May 13 12:09:14 2010 -0700" }, "committer": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Thu May 13 12:09:14 2010 -0700" }, "message": "Remove libdrm2. This code appears to be unused.\n\nThis code generates warnings when compiled with -Wformat-security,\nand since it isn\u0027t being used, I figured it\u0027s better\nto just delete it. As always, this code can be restored\nby reverting this change.\n\nChange-Id: I1da2049f41312b6eae5fa42892beb4a2036eb12f\n" }, { "commit": "e292b3bc9c28e47bb8411728ad40efb84d0471e8", "tree": "cb51804b07a1e1744a6ecf7a8313f05406303348", "parents": [ "fae47fd008974fb78f38ae4a6d539cd8246d3159" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 13 12:07:32 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu May 13 12:08:29 2010 -0700" }, "message": "Remove dummy surface in CameraSource\n\nbug - 2680919\n\nChange-Id: Ia0308cf57fd67058b4dd0e042b3ce97f13df475f\n" }, { "commit": "9ef0f0d9d2fa9ebc2eed0965f8910252720bfd87", "tree": "9c81e2e7b438aa0589daa329494b2ee4bf6a2e5c", "parents": [ "ecfb185eedecde3895b1340dfdb12b65bb72c32c", "ade63a0555f2afa760329038024fc819715b0e72" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu May 13 11:39:51 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Thu May 13 11:39:51 2010 -0700" }, "message": "Merge \"New test in FrameworkTest for the VelocityTracker class\"" }, { "commit": "fae47fd008974fb78f38ae4a6d539cd8246d3159", "tree": "e84887e55ae36a85a0f51477bc8e46f30596a5ed", "parents": [ "485b800eacafbf13244ca245f6ddaf47c0d31c08", "28fadef2ede2d74e9526266e779553bbd1dc66f4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu May 13 11:18:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 11:18:24 2010 -0700" }, "message": "am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.\n\nMerge commit \u002728fadef2ede2d74e9526266e779553bbd1dc66f4\u0027 into kraken\n\n* commit \u002728fadef2ede2d74e9526266e779553bbd1dc66f4\u0027:\n Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.\n" }, { "commit": "28fadef2ede2d74e9526266e779553bbd1dc66f4", "tree": "1c2854a1d3fb85626551cf558866a31f673a11cd", "parents": [ "1a3b3d48413d9134738c9b457292fb2b71a5dfe4", "3c78a1b58957e31d2991fb6a609abecbb1987b3b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu May 13 11:16:43 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 11:16:43 2010 -0700" }, "message": "am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.\n\nMerge commit \u00273c78a1b58957e31d2991fb6a609abecbb1987b3b\u0027 into froyo-plus-aosp\n\n* commit \u00273c78a1b58957e31d2991fb6a609abecbb1987b3b\u0027:\n Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.\n" }, { "commit": "ecfb185eedecde3895b1340dfdb12b65bb72c32c", "tree": "7d3a698a8b043a85def26af5a8063b13204b0cdc", "parents": [ "f3ca9a5c7e87319c934b5815566054d2e5c2085f", "ce2a97aeb82d3f34a63472720ee9d53e53c248c2" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu May 13 11:06:28 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Thu May 13 11:06:28 2010 -0700" }, "message": "Merge \"Preserve \u0027+\u0027 in phone numbers imported from SIM.\"" }, { "commit": "485b800eacafbf13244ca245f6ddaf47c0d31c08", "tree": "62c15fc401a7c1b93386844d0a6c80008724a216", "parents": [ "ca20104a3ab0c10d570080e3d3b4ff94fedf60ee", "1a3b3d48413d9134738c9b457292fb2b71a5dfe4" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu May 13 09:53:16 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu May 13 09:53:16 2010 -0700" }, "message": "am 1a3b3d48: merge from open-source master\n\nMerge commit \u00271a3b3d48413d9134738c9b457292fb2b71a5dfe4\u0027 into kraken\n\n* commit \u00271a3b3d48413d9134738c9b457292fb2b71a5dfe4\u0027:\n Add some documentation about the thread safety of Cursor and some of the SQLite* classes.\n" }, { "commit": "3c78a1b58957e31d2991fb6a609abecbb1987b3b", "tree": "bb88120232e7466b6ee121a9b8a40b5deff52c6b", "parents": [ "8ea9f130d24a7dd1e505ba0cf437bdd8a660975e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu May 13 09:15:21 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu May 13 09:19:35 2010 -0700" }, "message": "Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.\n\nChange-Id: Ie084ed4df5a5d286abd36d9149c2138f8e7ed08a\nrelated-to-bug: 2682221\nQA-impact: none\n" }, { "commit": "1a3b3d48413d9134738c9b457292fb2b71a5dfe4", "tree": "3d09a53faed13a6587c13e4b497df7959043ab8b", "parents": [ "fa2e3dcd855f573e160dbf258fd60a172b6e3f02", "f3ca9a5c7e87319c934b5815566054d2e5c2085f" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu May 13 09:04:45 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu May 13 09:04:45 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101\n" }, { "commit": "ca20104a3ab0c10d570080e3d3b4ff94fedf60ee", "tree": "f6320d88fe69d960de3c53dfc3e8e86ffcd49cb3", "parents": [ "c247328dfd86f7967846ffceb5ef99405dd22ab0", "4f0f17d2f10ceb22c2e23b593bab434fc899ecb7" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 12 23:40:28 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 12 23:40:28 2010 -0700" }, "message": "Merge \"Fix issue 2678048: binder death detection in AudioFlinger is broken.\" into kraken" }, { "commit": "c247328dfd86f7967846ffceb5ef99405dd22ab0", "tree": "c03fbe9f822918ebd89c961205bee688dd9ffa99", "parents": [ "c195965893da2003a3da9936391c27db05d47dd8", "fc1246640f1ac7f562c6a05ab34d7847ff8cca05" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 12 23:21:42 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 12 23:21:42 2010 -0700" }, "message": "Merge \"Several fixes in AudioDumpInterface:\" into kraken" }, { "commit": "c195965893da2003a3da9936391c27db05d47dd8", "tree": "f8be3b34d4e98e489df4291add007bff402d065b", "parents": [ "75181b42c97bc0e7eab11991cd45d3f83ad9f5d1", "fa2e3dcd855f573e160dbf258fd60a172b6e3f02" ], "author": { "name": "Costin Manolache", "email": "costin@google.com", "time": "Wed May 12 19:10:01 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 19:10:01 2010 -0700" }, "message": "am fa2e3dcd: am 8ea9f130: Merge \"Bug 2680071: Rename the Cloud to Device\" into froyo\n\nMerge commit \u0027fa2e3dcd855f573e160dbf258fd60a172b6e3f02\u0027 into kraken\n\n* commit \u0027fa2e3dcd855f573e160dbf258fd60a172b6e3f02\u0027:\n Bug 2680071: Rename the Cloud to Device\n" }, { "commit": "fa2e3dcd855f573e160dbf258fd60a172b6e3f02", "tree": "14b6fbcc9105367a3ccbb876042b3b6e032b1207", "parents": [ "c99c401d93f94d4243ed8cdd5fec101efc9ee265", "8ea9f130d24a7dd1e505ba0cf437bdd8a660975e" ], "author": { "name": "Costin Manolache", "email": "costin@google.com", "time": "Wed May 12 19:06:39 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 19:06:39 2010 -0700" }, "message": "am 8ea9f130: Merge \"Bug 2680071: Rename the Cloud to Device\" into froyo\n\nMerge commit \u00278ea9f130d24a7dd1e505ba0cf437bdd8a660975e\u0027 into froyo-plus-aosp\n\n* commit \u00278ea9f130d24a7dd1e505ba0cf437bdd8a660975e\u0027:\n Bug 2680071: Rename the Cloud to Device\n" }, { "commit": "8ea9f130d24a7dd1e505ba0cf437bdd8a660975e", "tree": "32ae015aeb3ba10a916b6fad79476ed488edc500", "parents": [ "38b523af5c233dd5f8631ada2cd80b2d75b0efde", "8d83f9e31bfff0281b522c53e035dffc7dd00ba9" ], "author": { "name": "Costin Manolache", "email": "costin@google.com", "time": "Wed May 12 19:04:27 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 12 19:04:27 2010 -0700" }, "message": "Merge \"Bug 2680071: Rename the Cloud to Device\" into froyo" }, { "commit": "75181b42c97bc0e7eab11991cd45d3f83ad9f5d1", "tree": "c870202f329cbd4668d2b72149554ade455173be", "parents": [ "7406eafe7f9774e095383d4ea14f776808da562e" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed May 12 18:37:43 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed May 12 18:37:43 2010 -0700" }, "message": "another attempt at fixing the build\n\nChange-Id: I80b498d1bbb8f9ffcec4f27802be7ae9977f70ac\n" }, { "commit": "7406eafe7f9774e095383d4ea14f776808da562e", "tree": "c2337bf3b1bdb5d531fb1c7d48460208094bd7a8", "parents": [ "2f0e6753d6c0d67e0e133105bf3fdc8596749412" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed May 12 18:26:13 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed May 12 18:26:13 2010 -0700" }, "message": "should fix the build\n\nChange-Id: I9957fc43d5fce317479f6c55fb0b9612bff9a495\n" }, { "commit": "2f0e6753d6c0d67e0e133105bf3fdc8596749412", "tree": "b3733f32dd6d0cb954db0c17c8b6d17ad2460b61", "parents": [ "6a70cb8a3813a60b92618892188bc4e2f9e0ab2c", "59751dbf7d8f12aeb5c4c07719b7dbbf1f9b5d4b" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed May 12 17:36:46 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 12 17:36:46 2010 -0700" }, "message": "Merge \"SharedBufferStack now can grow up to 16 buffers.\" into kraken" }, { "commit": "6a70cb8a3813a60b92618892188bc4e2f9e0ab2c", "tree": "92f3ef4bf2cda78827fa0df16f11f0d62cefc0df", "parents": [ "ca64ed6a8114f08e153b065cf429d006ab210f2b", "9f2c4fd9a14ea79e4cbbd3ab8925794711a6411c" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed May 12 17:35:24 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 12 17:35:24 2010 -0700" }, "message": "Merge \"Refactor some code in surfaceflinger in preparation of upcoming changes\" into kraken" } ], "next": "ca64ed6a8114f08e153b065cf429d006ab210f2b" }