)]}' { "log": [ { "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": "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": "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": "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": "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" }, { "commit": "ca64ed6a8114f08e153b065cf429d006ab210f2b", "tree": "18ae651222e0298b1e56809506fd1644e05c0ecc", "parents": [ "8b518577ceba9746fe5566274bd9deb09d450779", "aca2ee8a7045e6b3d0399736d7d1adf7e1dbf825" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed May 12 17:35:12 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 12 17:35:12 2010 -0700" }, "message": "Merge \"remove the \"memcpy\" hack\" into kraken" }, { "commit": "59751dbf7d8f12aeb5c4c07719b7dbbf1f9b5d4b", "tree": "a1f1d7119a8109d06cfc2f24b26284ff7627de7a", "parents": [ "9f2c4fd9a14ea79e4cbbd3ab8925794711a6411c" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri May 07 15:58:44 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed May 12 17:28:20 2010 -0700" }, "message": "SharedBufferStack now can grow up to 16 buffers.\n\nthere is a new resize() api, which currently only allows growing.\n\nChange-Id: Ia37b81b73be466d2491ffed7f3a23cd8e113c6fe\n" }, { "commit": "9f2c4fd9a14ea79e4cbbd3ab8925794711a6411c", "tree": "59ef7201919232e3fe9b0bd044339608db459128", "parents": [ "aca2ee8a7045e6b3d0399736d7d1adf7e1dbf825" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon May 10 20:06:11 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed May 12 17:26:22 2010 -0700" }, "message": "Refactor some code in surfaceflinger in preparation of upcoming changes\n\nthe new TextureMagager class now handle texture creation and upload\nas well as EGL image creation and binding to GraphicBuffers. This is\nused indirectly by Layer and directly by LayerBuffer\n\nthe new BufferManager class handles the set of buffers used for a\nLayer (Surface), it abstracts how many buffer there is as well as\nthe use of EGLimage vs. regular texture ops (glTexImage2D).\n\nChange-Id: I2da1ddcf27758e6731400f6cc4e20bef35c0a39a\n" }, { "commit": "f3ca9a5c7e87319c934b5815566054d2e5c2085f", "tree": "d3310bfacec0013dda68ca5e0e334a55d8f8ee79", "parents": [ "052203e50c42bb75ceb90e8f4fa050aed7e70409" ], "author": { "name": "Jeff Hamilton", "email": "jham@android.com", "time": "Wed May 12 15:04:33 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed May 12 16:44:19 2010 -0700" }, "message": "Add some documentation about the thread safety of Cursor and some of the SQLite* classes.\n\nChange-Id: Icae51052d1c942d7d60bb958d3703411da001079\n" }, { "commit": "8d83f9e31bfff0281b522c53e035dffc7dd00ba9", "tree": "a6f1e106e430e95fa5665325c17c01412ddc7c60", "parents": [ "e0dc80f878b56ed744bd06d341716fcfff4e3acc" ], "author": { "name": "Costin Manolache", "email": "costin@google.com", "time": "Wed May 12 16:04:10 2010 -0700" }, "committer": { "name": "Costin Manolache", "email": "costin@google.com", "time": "Wed May 12 16:16:34 2010 -0700" }, "message": "Bug 2680071: Rename the Cloud to Device\n\nChange-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5\n" }, { "commit": "aca2ee8a7045e6b3d0399736d7d1adf7e1dbf825", "tree": "fc96b9731e668b9a4c5fa54bcf9457a375be2f62", "parents": [ "e46defea3ae15787aa6afbb91cb9dc83d4a074e4" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon May 10 20:10:10 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed May 12 15:44:26 2010 -0700" }, "message": "remove the \"memcpy\" hack\n\nthis hack was used for gpus that don\u0027t support cached buffers\nfor s/w clients. currently we have no gpu with this issue.\nthis removes quite a bit of complexity.\n\nChange-Id: I72564669f124f92805030e61983711f61c76b6d9\n" }, { "commit": "8b518577ceba9746fe5566274bd9deb09d450779", "tree": "7a07815a688e882b20ed232571a4efbd82743c3f", "parents": [ "637683368758c18853df5b22ae876b9fedd471dc", "c99c401d93f94d4243ed8cdd5fec101efc9ee265" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 15:35:47 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 15:35:47 2010 -0700" }, "message": "am c99c401d: am 38b523af: Merge \"docs: add missing path-permissions document\" into froyo\n\nMerge commit \u0027c99c401d93f94d4243ed8cdd5fec101efc9ee265\u0027 into kraken\n\n* commit \u0027c99c401d93f94d4243ed8cdd5fec101efc9ee265\u0027:\n docs: add missing path-permissions document\n" }, { "commit": "637683368758c18853df5b22ae876b9fedd471dc", "tree": "b9f1327e1fbe12651df47b68c2cee56cf353b3fb", "parents": [ "2fb3b394fb8fc35289f261f7bf07d0c0b6687a7f", "8b27c965c8a4cb8ceb4b50484d55270758703768" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 15:35:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 15:35:41 2010 -0700" }, "message": "am 8b27c965: am f0e4ae56: Merge \"docs: fix broken links\" into froyo\n\nMerge commit \u00278b27c965c8a4cb8ceb4b50484d55270758703768\u0027 into kraken\n\n* commit \u00278b27c965c8a4cb8ceb4b50484d55270758703768\u0027:\n docs: fix broken links\n" }, { "commit": "2fb3b394fb8fc35289f261f7bf07d0c0b6687a7f", "tree": "c7cfd7efbb199149ac589cb0599bbc36c17e4e54", "parents": [ "1f35de2a2e9a5607cc3bc57fbd33c65392c82cfd", "bfc63c7b83160fd3e771e5187d317348e72d6c27" ], "author": { "name": "Grace Kloba", "email": "klobag@google.com", "time": "Wed May 12 15:35:37 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 15:35:37 2010 -0700" }, "message": "am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\\\u0027t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.\n\nMerge commit \u0027bfc63c7b83160fd3e771e5187d317348e72d6c27\u0027 into kraken\n\n* commit \u0027bfc63c7b83160fd3e771e5187d317348e72d6c27\u0027:\n The default AlertDialog allows cancel. But the default\n" }, { "commit": "c99c401d93f94d4243ed8cdd5fec101efc9ee265", "tree": "c934d843edb07923aa5c7ff7684a643c16910d13", "parents": [ "8b27c965c8a4cb8ceb4b50484d55270758703768", "38b523af5c233dd5f8631ada2cd80b2d75b0efde" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 15:33:38 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 15:33:38 2010 -0700" }, "message": "am 38b523af: Merge \"docs: add missing path-permissions document\" into froyo\n\nMerge commit \u002738b523af5c233dd5f8631ada2cd80b2d75b0efde\u0027 into froyo-plus-aosp\n\n* commit \u002738b523af5c233dd5f8631ada2cd80b2d75b0efde\u0027:\n docs: add missing path-permissions document\n" }, { "commit": "8b27c965c8a4cb8ceb4b50484d55270758703768", "tree": "bf4aefba53e92d55c4f2e52db71f2c9a9b5a1cb0", "parents": [ "bfc63c7b83160fd3e771e5187d317348e72d6c27", "f0e4ae563228db584041d517672aeadacecba61f" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 15:33:35 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 15:33:35 2010 -0700" }, "message": "am f0e4ae56: Merge \"docs: fix broken links\" into froyo\n\nMerge commit \u0027f0e4ae563228db584041d517672aeadacecba61f\u0027 into froyo-plus-aosp\n\n* commit \u0027f0e4ae563228db584041d517672aeadacecba61f\u0027:\n docs: fix broken links\n" }, { "commit": "bfc63c7b83160fd3e771e5187d317348e72d6c27", "tree": "25bd9853af7387bd4c31699414571b8fa23fa3b9", "parents": [ "79090cb3da132d07cd3888ef9242df9872fb4aa1", "336d7dcb105a43ee4de51fd0f26f277c63662f02" ], "author": { "name": "Grace Kloba", "email": "klobag@google.com", "time": "Wed May 12 15:33:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 15:33:30 2010 -0700" }, "message": "am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\\\u0027t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.\n\nMerge commit \u0027336d7dcb105a43ee4de51fd0f26f277c63662f02\u0027 into froyo-plus-aosp\n\n* commit \u0027336d7dcb105a43ee4de51fd0f26f277c63662f02\u0027:\n The default AlertDialog allows cancel. But the default\n" }, { "commit": "1f35de2a2e9a5607cc3bc57fbd33c65392c82cfd", "tree": "ca1b5e4ef280c0049075236ed46b91a3db7c24ce", "parents": [ "d6e24ca28b0b6384fd9b3117713402a1f43fdef8", "79090cb3da132d07cd3888ef9242df9872fb4aa1" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 15:06:13 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 15:06:13 2010 -0700" }, "message": "am 79090cb3: merge from open-source master\n\nMerge commit \u002779090cb3da132d07cd3888ef9242df9872fb4aa1\u0027 into kraken\n\n* commit \u002779090cb3da132d07cd3888ef9242df9872fb4aa1\u0027:\n Change license for the UUS Information file.\n Remove ProximityAlerts Receiver when last ProximityAlert expires.\n" }, { "commit": "38b523af5c233dd5f8631ada2cd80b2d75b0efde", "tree": "e59473c3166fdf075a54a446bef5a0ca6f2b39be", "parents": [ "f0e4ae563228db584041d517672aeadacecba61f", "5385cc20f6252128187ee99aa9e5c5f52cd082cd" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 15:01:30 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 12 15:01:31 2010 -0700" }, "message": "Merge \"docs: add missing path-permissions document\" into froyo" }, { "commit": "d6e24ca28b0b6384fd9b3117713402a1f43fdef8", "tree": "f97eb1d9a5b87097062726c20fe204b862a46b07", "parents": [ "e8621534db97070cc40f729d1eb8074f2e69df9d", "4adacd23d4c91569b16fe50419f1a91f68d805bd" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 14:56:00 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 14:56:00 2010 -0700" }, "message": "am 4adacd23: merge from open-source master\n\nMerge commit \u00274adacd23d4c91569b16fe50419f1a91f68d805bd\u0027 into kraken\n\n* commit \u00274adacd23d4c91569b16fe50419f1a91f68d805bd\u0027:\n Add support for EVDO Rev B\n" }, { "commit": "e8621534db97070cc40f729d1eb8074f2e69df9d", "tree": "54b8857783ced454e0b05b185753a652d4899b37", "parents": [ "2a2174a7bdd7a557d3e17b78876b6887a02ebf80", "68246dcec17c245a434dad70b778960dc5c84af1" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Wed May 12 14:54:42 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 12 14:54:42 2010 -0700" }, "message": "Merge \"ZipUtilsRO rewrite based on Dalvik Zip rewrite\" into kraken" }, { "commit": "79090cb3da132d07cd3888ef9242df9872fb4aa1", "tree": "2272ecbd72a27bdff63b17f7cbd29a579c7e0b93", "parents": [ "4adacd23d4c91569b16fe50419f1a91f68d805bd", "052203e50c42bb75ceb90e8f4fa050aed7e70409" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 14:54:38 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 14:54:38 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa\n" }, { "commit": "f0e4ae563228db584041d517672aeadacecba61f", "tree": "080bba6db8e47fb7a6fb2d140b085d859e89bed4", "parents": [ "336d7dcb105a43ee4de51fd0f26f277c63662f02", "5dd0fd5c89099f194b9ec2323bb6413fa48e7db8" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 14:53:35 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 12 14:53:35 2010 -0700" }, "message": "Merge \"docs: fix broken links\" into froyo" }, { "commit": "4adacd23d4c91569b16fe50419f1a91f68d805bd", "tree": "38628f3446882f39ff46d6d5a2cb655fc3ca71ff", "parents": [ "ccfd99b1e2a64c72ec433ebf5cf98d644ab24614", "0a5174a6e947d5cbeb8846a1273a90b6de065cbf" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 14:53:25 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 14:53:25 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: If6730b50627b2231bd345e594d8d30a37557849e\n" }, { "commit": "5dd0fd5c89099f194b9ec2323bb6413fa48e7db8", "tree": "f44338e12d62d9d1c4b81c221ad0264167806016", "parents": [ "18dc51d4137c5cf8364541e25ad9ded203342c6b" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 14:49:38 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 14:49:38 2010 -0700" }, "message": "docs: fix broken links\n\nChange-Id: I2720ce4fe30b1e6ff35b91f48a98ead8999ed1ab\n" }, { "commit": "2a2174a7bdd7a557d3e17b78876b6887a02ebf80", "tree": "69ec59de282834be17b1795b2f7b1389acfc75b3", "parents": [ "72a6af1ab13fbcb98598b0e11b0bb3b069d30635", "ccfd99b1e2a64c72ec433ebf5cf98d644ab24614" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 14:41:40 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 14:41:40 2010 -0700" }, "message": "am ccfd99b1: merge from open-source master\n\nMerge commit \u0027ccfd99b1e2a64c72ec433ebf5cf98d644ab24614\u0027 into kraken\n\n* commit \u0027ccfd99b1e2a64c72ec433ebf5cf98d644ab24614\u0027:\n Support for User to User Signaling (UUS)\n" }, { "commit": "ccfd99b1e2a64c72ec433ebf5cf98d644ab24614", "tree": "94ea23da21833dc40283d05a74621950d386662c", "parents": [ "7d9526445c8631f347c7bf7d944e5bb1dc35b0b5", "24440cf8a9431291bdcaa77b418e6c4715932507" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 14:39:38 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 14:39:38 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5\n" }, { "commit": "336d7dcb105a43ee4de51fd0f26f277c63662f02", "tree": "217b8d67ba591d810d2eb55a9cc7ce187d877f0d", "parents": [ "a04202b3258845688bcd8c6208222235569df733" ], "author": { "name": "Grace Kloba", "email": "klobag@google.com", "time": "Wed May 12 14:28:07 2010 -0700" }, "committer": { "name": "Grace Kloba", "email": "klobag@google.com", "time": "Wed May 12 14:28:07 2010 -0700" }, "message": "The default AlertDialog allows cancel. But the default\nJSConfim doesn\u0027t have a cancel listener. So when\nuser cancel the dialog, we do not wake up the WebCoreThread.\nThe same code is already done for JSPrompt dialog correctly.\n\nFix http://b/issue?id\u003d2679139" }, { "commit": "72a6af1ab13fbcb98598b0e11b0bb3b069d30635", "tree": "c1d44d7cacbc3d72a63015b1426ba986085c3b40", "parents": [ "63ece47fecdb5932de9af5cfec4cf998764e6e0a", "7d9526445c8631f347c7bf7d944e5bb1dc35b0b5" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 14:12:25 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 14:12:25 2010 -0700" }, "message": "am 7d952644: merge from open-source master\n\nMerge commit \u00277d9526445c8631f347c7bf7d944e5bb1dc35b0b5\u0027 into kraken\n\n* commit \u00277d9526445c8631f347c7bf7d944e5bb1dc35b0b5\u0027:\n Support to display message when operation is blocked due to FDN being enabled\n" }, { "commit": "7d9526445c8631f347c7bf7d944e5bb1dc35b0b5", "tree": "42f578813ce5d2179c662cf89745d96e16d12e0b", "parents": [ "2a9ae01f74e7273ce0d1045754597ea78b88ba69", "cf1250c149120eebb464d9e613272e0976ff9498" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 14:10:23 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 14:10:23 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9\n" }, { "commit": "63ece47fecdb5932de9af5cfec4cf998764e6e0a", "tree": "b42abf928fc8a10b25e319651348ae0ae2ecf41a", "parents": [ "55bef14f153c1a80006de2ff86bcf67984a6e1a8", "2a9ae01f74e7273ce0d1045754597ea78b88ba69" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 12:44:27 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 12:44:27 2010 -0700" }, "message": "am 2a9ae01f: merge from open-source master\n\nMerge commit \u00272a9ae01f74e7273ce0d1045754597ea78b88ba69\u0027 into kraken\n\n* commit \u00272a9ae01f74e7273ce0d1045754597ea78b88ba69\u0027:\n Corrected repeat count for key repeat in input device.\n" }, { "commit": "2a9ae01f74e7273ce0d1045754597ea78b88ba69", "tree": "0b916d365fd86f189f96ffc42174d02489a4cdef", "parents": [ "fb234bbe5e7cbae42b4fc8f4ab353ba561599db2", "133bfdfa4a89f40f15371e99904639ff5db7759a" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 12:33:35 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 12:33:35 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b\n" }, { "commit": "55bef14f153c1a80006de2ff86bcf67984a6e1a8", "tree": "6416e431f8b723833df2f6e796c1f806fb5d0954", "parents": [ "e46defea3ae15787aa6afbb91cb9dc83d4a074e4", "fb234bbe5e7cbae42b4fc8f4ab353ba561599db2" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 12:13:18 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 12:13:18 2010 -0700" }, "message": "am fb234bbe: merge from open-source master\n\nMerge commit \u0027fb234bbe5e7cbae42b4fc8f4ab353ba561599db2\u0027 into kraken\n\n* commit \u0027fb234bbe5e7cbae42b4fc8f4ab353ba561599db2\u0027:\n Notify user regarding invalid number during MO call.\n Build software AGL library with correct get_tls() macro for ARMv7 based platforms\n Fix glReadPixels() to verify that both x and y are non-negative.\n" }, { "commit": "052203e50c42bb75ceb90e8f4fa050aed7e70409", "tree": "6ae44324163f3ad3f753008899875e5da4b7e49b", "parents": [ "26abeae75baa471fa7c8d686083c2f12f3246968" ], "author": { "name": "Naveen Kalla", "email": "nkalla@codeaurora.org", "time": "Wed May 12 11:53:00 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed May 12 12:02:09 2010 -0700" }, "message": "Change license for the UUS Information file.\n\nChange-Id: Idd77e9078354a46605142c2eb704823aaa7d560d\n" }, { "commit": "fb234bbe5e7cbae42b4fc8f4ab353ba561599db2", "tree": "c5bd66bef1f7290ed41589b86cfb3cb8cca5efb5", "parents": [ "68b37d14708414d3cee418024c178f0a3c7d8b5b", "ef2cf71420550fb45f89e67c56f338031f0adb63" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 11:58:14 2010 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed May 12 11:58:14 2010 -0700" }, "message": "merge from open-source master\n\nChange-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c\n" }, { "commit": "5385cc20f6252128187ee99aa9e5c5f52cd082cd", "tree": "033ba15f58e153ace7809fc2dc7327483944cc81", "parents": [ "18dc51d4137c5cf8364541e25ad9ded203342c6b" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 11:31:03 2010 -0700" }, "committer": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 11:31:03 2010 -0700" }, "message": "docs: add missing path-permissions document\n\nChange-Id: I926f6ead8babbb66ead386890c143e1bc3ddf229\n" }, { "commit": "e46defea3ae15787aa6afbb91cb9dc83d4a074e4", "tree": "15ab86dcd8f11585a7c122c4c13d969b80dc6a4c", "parents": [ "afbc5fad91a5da627b908526b9604833d8d37bcb", "68b37d14708414d3cee418024c178f0a3c7d8b5b" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed May 12 11:10:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 11:10:10 2010 -0700" }, "message": "am 68b37d14: am a04202b3: Merge \"Doc change: remove Google I/O 09 from carousel.\" into froyo\n\nMerge commit \u002768b37d14708414d3cee418024c178f0a3c7d8b5b\u0027 into kraken\n\n* commit \u002768b37d14708414d3cee418024c178f0a3c7d8b5b\u0027:\n Doc change: remove Google I/O 09 from carousel.\n" }, { "commit": "68b37d14708414d3cee418024c178f0a3c7d8b5b", "tree": "68c7c65a3ca8671e97fe2b7a5d16affb0afc38fe", "parents": [ "0d967ff0e2745bc208c3318a67d8ca688c3ea3d9", "a04202b3258845688bcd8c6208222235569df733" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed May 12 11:08:46 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 11:08:46 2010 -0700" }, "message": "am a04202b3: Merge \"Doc change: remove Google I/O 09 from carousel.\" into froyo\n\nMerge commit \u0027a04202b3258845688bcd8c6208222235569df733\u0027 into froyo-plus-aosp\n\n* commit \u0027a04202b3258845688bcd8c6208222235569df733\u0027:\n Doc change: remove Google I/O 09 from carousel.\n" }, { "commit": "a04202b3258845688bcd8c6208222235569df733", "tree": "67bc41dda499f7e2b1122c008054da4445441142", "parents": [ "18dc51d4137c5cf8364541e25ad9ded203342c6b", "b0e243b62a10a77d18c0d15ddd7b9282192bd3ff" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed May 12 11:05:03 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed May 12 11:05:03 2010 -0700" }, "message": "Merge \"Doc change: remove Google I/O 09 from carousel.\" into froyo" }, { "commit": "b0e243b62a10a77d18c0d15ddd7b9282192bd3ff", "tree": "f3318cf36d55046ac3d77536d6e6c1571fc598d3", "parents": [ "0d1b0814be24f501395bf175fba8691117f782d5" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed May 12 10:48:31 2010 -0700" }, "committer": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed May 12 10:48:31 2010 -0700" }, "message": "Doc change: remove Google I/O 09 from carousel.\n\nChange-Id: I5b97ceef5316930266d1b4581217afad74129372\n" }, { "commit": "afbc5fad91a5da627b908526b9604833d8d37bcb", "tree": "75a37c7ecd14922d9dacef6e45843ba98152d5fe", "parents": [ "1d9b25a0cc2403bc1e74c8ac82088bf7e44cf2c3" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed May 12 10:43:22 2010 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed May 12 10:43:22 2010 -0700" }, "message": "Fix build Remove from API 9 definition the two methods that were\n removed from API 8.\n\nChange-Id: I4b443a257b5674a7493ccda0a0427999e369fb4f\n" }, { "commit": "fc1246640f1ac7f562c6a05ab34d7847ff8cca05", "tree": "a66df8aae9d213a51d5ebbc4d71d0732412c75e7", "parents": [ "2cd841d485968181eb362338b9e66067767bd2eb" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 12 08:24:18 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed May 12 08:31:04 2010 -0700" }, "message": "Several fixes in AudioDumpInterface:\n\n- forward setMode() and getInputBufferSize() calls to underlying audio hardware interface.\n- Allow capture of more than one output stream (previous implementation was only capturing\nthe first output opened, namely the hardware output).\n- Allow capture of input streams: previous implementation was only simulating input streams\nwhen more than one was open at a time by reading from a file on SD card). Now the default\nbehavior is to capture PCM data read from input stream if it was successfully opened or\nsimulate capture otherwise.\n\nChange-Id: I7e2892b25e295fc3c19c7eb0f71bfaea5816b73a\n" }, { "commit": "1d9b25a0cc2403bc1e74c8ac82088bf7e44cf2c3", "tree": "ce2ebc1a29026bbe6df826fc5a24f9411fd1c099", "parents": [ "dd142ac3a9fe5507c89e50df50b7c62b6acc3c0e", "0d967ff0e2745bc208c3318a67d8ca688c3ea3d9" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:57:13 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:57:13 2010 -0700" }, "message": "am 0d967ff0: am 18dc51d4: Merge \"docs: fix broken anchor names\" into froyo\n\nMerge commit \u00270d967ff0e2745bc208c3318a67d8ca688c3ea3d9\u0027 into kraken\n\n* commit \u00270d967ff0e2745bc208c3318a67d8ca688c3ea3d9\u0027:\n docs: fix broken anchor names\n" }, { "commit": "dd142ac3a9fe5507c89e50df50b7c62b6acc3c0e", "tree": "1d9fb6aed73eb97e00a6e68d44c8dd859178ffde", "parents": [ "a1cdf27993e74fe5efc5b02261280986d5dddd03", "052e2102df8e45af2797faff7aefda26aeb345d7" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed May 12 07:57:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:57:10 2010 -0700" }, "message": "am 052e2102: am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.\n\nMerge commit \u0027052e2102df8e45af2797faff7aefda26aeb345d7\u0027 into kraken\n\n* commit \u0027052e2102df8e45af2797faff7aefda26aeb345d7\u0027:\n Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.\n" }, { "commit": "a1cdf27993e74fe5efc5b02261280986d5dddd03", "tree": "b4b9a5ffbf25a11dc432538eefaf205a4c3c920c", "parents": [ "812266dda4cc489b287090a0aeb5391af86bb9d3", "89f74cf66c635c8835d6fc4057c6901037f704dd" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed May 12 07:57:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:57:06 2010 -0700" }, "message": "am 89f74cf6: am 4d5275e7: Merge \"Doc change: update diff report 7-\u003e 8\" into froyo\n\nMerge commit \u002789f74cf66c635c8835d6fc4057c6901037f704dd\u0027 into kraken\n\n* commit \u002789f74cf66c635c8835d6fc4057c6901037f704dd\u0027:\n Doc change: update diff report 7-\u003e 8\n" }, { "commit": "812266dda4cc489b287090a0aeb5391af86bb9d3", "tree": "4717158a7c4c8bb7e5b0f356bbd6087e31e96ed5", "parents": [ "4924ea490f759335f347d2fcc615703912be9d2d", "a250e3287dea625930b1591b7139decc304bf76b" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:57:02 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:57:02 2010 -0700" }, "message": "am a250e328: am 827a50dd: Merge \"docs: remove the dashboard from the sidenav for the offline docs\" into froyo\n\nMerge commit \u0027a250e3287dea625930b1591b7139decc304bf76b\u0027 into kraken\n\n* commit \u0027a250e3287dea625930b1591b7139decc304bf76b\u0027:\n docs: remove the dashboard from the sidenav for the offline docs\n" }, { "commit": "4924ea490f759335f347d2fcc615703912be9d2d", "tree": "58c431bbe37ba7c0cc8ed13f4d9f04d8cdffedec", "parents": [ "9809015b485aef16250c06ed97d10e00c08c143d", "c8e84e12beb876f904d0090fe021beae73722786" ], "author": { "name": "Brett Chabot", "email": "brettchabot@android.com", "time": "Wed May 12 07:56:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:56:54 2010 -0700" }, "message": "am c8e84e12: am b4c9a8f6: Merge \"Fix imf tests.\" into froyo\n\nMerge commit \u0027c8e84e12beb876f904d0090fe021beae73722786\u0027 into kraken\n\n* commit \u0027c8e84e12beb876f904d0090fe021beae73722786\u0027:\n Fix imf tests.\n" }, { "commit": "9809015b485aef16250c06ed97d10e00c08c143d", "tree": "6955729fd62aede8eb91c71d4311a6d4fe3000ef", "parents": [ "5b46aa36b6c2d2f3f6fdfb0706ac961945e17b70", "21f18e9633967e69ebe7a172b902420fec485bba" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:56:49 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:56:49 2010 -0700" }, "message": "am 21f18e96: am bb129dc5: docs: make Notifying the User an expandable list\n\nMerge commit \u002721f18e9633967e69ebe7a172b902420fec485bba\u0027 into kraken\n\n* commit \u002721f18e9633967e69ebe7a172b902420fec485bba\u0027:\n docs: make Notifying the User an expandable list\n" }, { "commit": "5b46aa36b6c2d2f3f6fdfb0706ac961945e17b70", "tree": "a432f8f1b547caa6276e91f822f7e3320d5c581d", "parents": [ "1dc7c4ab6651ee7cf7a1e988fca09308651b3636", "d522b270a90cdd5f9bdedeb402b4738cfa294ee5" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:56:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:56:45 2010 -0700" }, "message": "am d522b270: am a225e3b1: docs: add quickview box with \"see also\" links for some articles\n\nMerge commit \u0027d522b270a90cdd5f9bdedeb402b4738cfa294ee5\u0027 into kraken\n\n* commit \u0027d522b270a90cdd5f9bdedeb402b4738cfa294ee5\u0027:\n docs: add quickview box with \"see also\" links for some articles\n" }, { "commit": "1dc7c4ab6651ee7cf7a1e988fca09308651b3636", "tree": "db1484f6b4221ece49de850136c6607f2f00af0a", "parents": [ "08eff49f09c4f4a725979166e61085f8bb30fb1f", "0130e3837638b998ff28786618bc6a7fc6417711" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:56:40 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:56:40 2010 -0700" }, "message": "am 0130e383: am 6bc3304b: Merge \"docs: remove allowBackup attribute from documentation\" into froyo\n\nMerge commit \u00270130e3837638b998ff28786618bc6a7fc6417711\u0027 into kraken\n\n* commit \u00270130e3837638b998ff28786618bc6a7fc6417711\u0027:\n docs: remove allowBackup attribute from documentation\n" }, { "commit": "08eff49f09c4f4a725979166e61085f8bb30fb1f", "tree": "fa959951a1b58662a9b60b5bd6859a577c4b30ee", "parents": [ "550884e2f3b551cd05ff669cab08348e053ee29b", "d9712b69ce529fbf50b3b837032c1dc40e623381" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed May 12 07:56:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:56:29 2010 -0700" }, "message": "am d9712b69: am b1235a57: Merge \"Hide two audio focus methods.\" into froyo\n\nMerge commit \u0027d9712b69ce529fbf50b3b837032c1dc40e623381\u0027 into kraken\n\n* commit \u0027d9712b69ce529fbf50b3b837032c1dc40e623381\u0027:\n Hide two audio focus methods.\n" }, { "commit": "550884e2f3b551cd05ff669cab08348e053ee29b", "tree": "b4feef1255b5dfb6278c5e22dec1fcb7c432e6a4", "parents": [ "bf00233b880b8944a3ed5f2a8826a1908939b6aa", "bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed May 12 07:56:24 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:56:24 2010 -0700" }, "message": "am bbafdc64: am 836b2d75: Merge \"Don\\\u0027t clear the _data column in the audio_meta table, since it isn\\\u0027t needed, and causes a sqlite constraint exception. Bug 2671792.\" into froyo\n\nMerge commit \u0027bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b\u0027 into kraken\n\n* commit \u0027bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b\u0027:\n Don\u0027t clear the _data column in the audio_meta table, since it isn\u0027t\n" }, { "commit": "bf00233b880b8944a3ed5f2a8826a1908939b6aa", "tree": "d393ac35a168232ac1661c6f9afe29f310bbe92d", "parents": [ "856f0bad1669de8afaa5d8d696a9e3160f72ebb3", "b6e1ec19dd73cb55baef538a9119bcac0f8b9366" ], "author": { "name": "Dianne Hackborn", "email": "hackbod@google.com", "time": "Wed May 12 07:56:19 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:56:19 2010 -0700" }, "message": "am b6e1ec19: am 037cd341: Merge \"Fix issue #2676378: Activity Manager Crash on FRF40\" into froyo\n\nMerge commit \u0027b6e1ec19dd73cb55baef538a9119bcac0f8b9366\u0027 into kraken\n\n* commit \u0027b6e1ec19dd73cb55baef538a9119bcac0f8b9366\u0027:\n Fix issue #2676378: Activity Manager Crash on FRF40\n" }, { "commit": "856f0bad1669de8afaa5d8d696a9e3160f72ebb3", "tree": "d2a0bf6494f74e369ca8816496347e41f2b4a249", "parents": [ "a38f5e705ce374e4910eb6f7fad156d3f900ec9a", "84a30dbff1d6e04fd7660983233ae5502b414b07" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:56:13 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:56:13 2010 -0700" }, "message": "am 84a30dbf: am 5cdf5fdc: docs: add document about app install location\n\nMerge commit \u002784a30dbff1d6e04fd7660983233ae5502b414b07\u0027 into kraken\n\n* commit \u002784a30dbff1d6e04fd7660983233ae5502b414b07\u0027:\n docs: add document about app install location\n" }, { "commit": "a38f5e705ce374e4910eb6f7fad156d3f900ec9a", "tree": "d8b30dfd19f600638970e4c25412333b36a38d70", "parents": [ "5cb0d5015a145734e4bf50f45c8e6d7711c914dc", "712f6408140af90477bccbc64f598c5e51833c7b" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed May 12 07:56:07 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:56:07 2010 -0700" }, "message": "am 712f6408: am 8acb68e9: Merge \"Doc Change: Docs for NDK r4.\" into froyo\n\nMerge commit \u0027712f6408140af90477bccbc64f598c5e51833c7b\u0027 into kraken\n\n* commit \u0027712f6408140af90477bccbc64f598c5e51833c7b\u0027:\n Doc Change: Docs for NDK r4.\n" }, { "commit": "5cb0d5015a145734e4bf50f45c8e6d7711c914dc", "tree": "767f2f1aac05f0d6dd805b7a865e3f5cec22404d", "parents": [ "c7c856fb855cdf233077857b995594770515cf1b", "9c6895924053c0b732dcb2dd3ef7f419a4dab8c1" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:56:01 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:56:01 2010 -0700" }, "message": "am 9c689592: am c80b95a8: Merge \"docs: announce froyo and update IO message\" into froyo\n\nMerge commit \u00279c6895924053c0b732dcb2dd3ef7f419a4dab8c1\u0027 into kraken\n\n* commit \u00279c6895924053c0b732dcb2dd3ef7f419a4dab8c1\u0027:\n docs: announce froyo and update IO message\n" }, { "commit": "c7c856fb855cdf233077857b995594770515cf1b", "tree": "307d71c06d790dffea1aca3d8430c5cb62085033", "parents": [ "11777d6fa27b368eee75c46aeb0da2c609943c9d", "d2084bb689bb680eb886d5cfbd27adc6f2e9da1c" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Wed May 12 07:55:55 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:55:55 2010 -0700" }, "message": "am d2084bb6: am e1d7dca6: Merge \"LocationManagerService: Call updateNetworkState on providers that are disabled.\" into froyo\n\nMerge commit \u0027d2084bb689bb680eb886d5cfbd27adc6f2e9da1c\u0027 into kraken\n\n* commit \u0027d2084bb689bb680eb886d5cfbd27adc6f2e9da1c\u0027:\n LocationManagerService: Call updateNetworkState on providers that are disabled.\n" }, { "commit": "11777d6fa27b368eee75c46aeb0da2c609943c9d", "tree": "d0295e5bb67c7ed2cdd9204b5a1844d0091f89d6", "parents": [ "b076e6f3e03d146cc7e76e423077a2dfe901c898", "b003ad17bffeba7875b9708ffeef2300ef28c916" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed May 12 07:55:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:55:48 2010 -0700" }, "message": "am b003ad17: am e0dc80f8: Merge \"Support for customizable socket-read timeouts through the HTTP response.\" into froyo\n\nMerge commit \u0027b003ad17bffeba7875b9708ffeef2300ef28c916\u0027 into kraken\n\n* commit \u0027b003ad17bffeba7875b9708ffeef2300ef28c916\u0027:\n Support for customizable socket-read timeouts through the HTTP response.\n" }, { "commit": "b076e6f3e03d146cc7e76e423077a2dfe901c898", "tree": "39c9547e74ff901dbb4ab8c6c6059cdf115642bd", "parents": [ "8579a4d72697a752fe33445b5c57d09e0151b559", "227e443a43d70b9463b2e685688f73cfb1b72096" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed May 12 07:55:40 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:55:40 2010 -0700" }, "message": "am 227e443a: am d6ad7c85: Merge \"Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)\" into froyo\n\nMerge commit \u0027227e443a43d70b9463b2e685688f73cfb1b72096\u0027 into kraken\n\n* commit \u0027227e443a43d70b9463b2e685688f73cfb1b72096\u0027:\n Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)\n" }, { "commit": "8579a4d72697a752fe33445b5c57d09e0151b559", "tree": "1b807bb6183146454c4fecb966871a5e1bb32172", "parents": [ "fd5a747fc8bb12d16224e7d961813bb2d795239f", "625de488973f262e56d3ee6825a8cf1ebaee089b" ], "author": { "name": "Costin Manolache", "email": "costin@google.com", "time": "Wed May 12 07:55:32 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:55:32 2010 -0700" }, "message": "am 625de488: am e2055fe4: Merge \"Bug 2673557: rename datamessaging\" into froyo\n\nMerge commit \u0027625de488973f262e56d3ee6825a8cf1ebaee089b\u0027 into kraken\n\n* commit \u0027625de488973f262e56d3ee6825a8cf1ebaee089b\u0027:\n Bug 2673557: rename datamessaging\n" }, { "commit": "fd5a747fc8bb12d16224e7d961813bb2d795239f", "tree": "b3a2e0539179c424bdd9f25964028e68e3487561", "parents": [ "17246c6d90edd89f8c2e5656927c2f831ea7c8d4", "0c73adb1dead4097b9c7dc04b8a547aaab817e85" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed May 12 07:55:25 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:55:25 2010 -0700" }, "message": "am 0c73adb1: am 3e90c76c: Merge \"Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods.\" into froyo\n\nMerge commit \u00270c73adb1dead4097b9c7dc04b8a547aaab817e85\u0027 into kraken\n\n* commit \u00270c73adb1dead4097b9c7dc04b8a547aaab817e85\u0027:\n Update javadoc in android.media.AudioManager to not hide the\n" }, { "commit": "17246c6d90edd89f8c2e5656927c2f831ea7c8d4", "tree": "752e8b568d247287b97c45185548231dc14548d3", "parents": [ "9f35d39a05bbf02ded519c1a4b3bf50f933a0cad", "6d405cfcfe200c0b60ab6e05047db2bde12f23c3" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed May 12 07:55:17 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:55:17 2010 -0700" }, "message": "am 6d405cfc: am fe089334: Merge \"Doc Change: cherry-pick from master. -\u003eTesting Procedures documents testing_eclipse.html, testing_otheride.\" into froyo\n\nMerge commit \u00276d405cfcfe200c0b60ab6e05047db2bde12f23c3\u0027 into kraken\n\n* commit \u00276d405cfcfe200c0b60ab6e05047db2bde12f23c3\u0027:\n Doc Change: cherry-pick from master. -\u003eTesting Procedures documents testing_eclipse.html, testing_otheride.\n" }, { "commit": "9f35d39a05bbf02ded519c1a4b3bf50f933a0cad", "tree": "ba14ddfc87e14309dce23f462a3d1f459dff233e", "parents": [ "b3390135890800b9c5f0ab58ae3af80ab200dd8e", "ea37d9b489aac1a4a8de71887581fe712e26e144" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed May 12 07:55:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:55:09 2010 -0700" }, "message": "am ea37d9b4: am aaa01b18: Merge \" Fix bug 2670395 and 2599698 When the user selects a \"Silent\" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the comp\n\nMerge commit \u0027ea37d9b489aac1a4a8de71887581fe712e26e144\u0027 into kraken\n\n* commit \u0027ea37d9b489aac1a4a8de71887581fe712e26e144\u0027:\n Fix bug 2670395 and 2599698\n" }, { "commit": "b3390135890800b9c5f0ab58ae3af80ab200dd8e", "tree": "8b150157548ef4b694037810a881142b8e1c85f9", "parents": [ "2cd841d485968181eb362338b9e66067767bd2eb", "d8c33747afbe98e893e0569f3bf45b67a9e8e728" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Wed May 12 07:55:00 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:55:00 2010 -0700" }, "message": "am d8c33747: am 78624e41: Add remove method in CameraParameters class.\n\nMerge commit \u0027d8c33747afbe98e893e0569f3bf45b67a9e8e728\u0027 into kraken\n\n* commit \u0027d8c33747afbe98e893e0569f3bf45b67a9e8e728\u0027:\n Add remove method in CameraParameters class.\n" }, { "commit": "0d967ff0e2745bc208c3318a67d8ca688c3ea3d9", "tree": "ea1295b01757d4932d6bfb9116c596248f7fa4e4", "parents": [ "052e2102df8e45af2797faff7aefda26aeb345d7", "18dc51d4137c5cf8364541e25ad9ded203342c6b" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:50:59 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:50:59 2010 -0700" }, "message": "am 18dc51d4: Merge \"docs: fix broken anchor names\" into froyo\n\nMerge commit \u002718dc51d4137c5cf8364541e25ad9ded203342c6b\u0027 into froyo-plus-aosp\n\n* commit \u002718dc51d4137c5cf8364541e25ad9ded203342c6b\u0027:\n docs: fix broken anchor names\n" }, { "commit": "052e2102df8e45af2797faff7aefda26aeb345d7", "tree": "b084e786daa18485e4f01e4a1d5fb1c10af40796", "parents": [ "89f74cf66c635c8835d6fc4057c6901037f704dd", "0d1b0814be24f501395bf175fba8691117f782d5" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed May 12 07:50:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:50:57 2010 -0700" }, "message": "am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.\n\nMerge commit \u00270d1b0814be24f501395bf175fba8691117f782d5\u0027 into froyo-plus-aosp\n\n* commit \u00270d1b0814be24f501395bf175fba8691117f782d5\u0027:\n Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.\n" }, { "commit": "89f74cf66c635c8835d6fc4057c6901037f704dd", "tree": "65efcaafb38f6caffc38f56472c691b7957a5839", "parents": [ "a250e3287dea625930b1591b7139decc304bf76b", "4d5275e723221df67aad00a440dd6a2e9a22caae" ], "author": { "name": "Dirk Dougherty", "email": "ddougherty@google.com", "time": "Wed May 12 07:50:53 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:50:53 2010 -0700" }, "message": "am 4d5275e7: Merge \"Doc change: update diff report 7-\u003e 8\" into froyo\n\nMerge commit \u00274d5275e723221df67aad00a440dd6a2e9a22caae\u0027 into froyo-plus-aosp\n\n* commit \u00274d5275e723221df67aad00a440dd6a2e9a22caae\u0027:\n Doc change: update diff report 7-\u003e 8\n" }, { "commit": "a250e3287dea625930b1591b7139decc304bf76b", "tree": "bacf394fbbe97f1ddfb7cc89e44fad5b2a8d5d90", "parents": [ "c8e84e12beb876f904d0090fe021beae73722786", "827a50dda4c1900ab5333f8c2d3705796ff4649d" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:50:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:50:48 2010 -0700" }, "message": "am 827a50dd: Merge \"docs: remove the dashboard from the sidenav for the offline docs\" into froyo\n\nMerge commit \u0027827a50dda4c1900ab5333f8c2d3705796ff4649d\u0027 into froyo-plus-aosp\n\n* commit \u0027827a50dda4c1900ab5333f8c2d3705796ff4649d\u0027:\n docs: remove the dashboard from the sidenav for the offline docs\n" }, { "commit": "c8e84e12beb876f904d0090fe021beae73722786", "tree": "dd23002f3305124a131698333ffd38b07e27390a", "parents": [ "21f18e9633967e69ebe7a172b902420fec485bba", "b4c9a8f664f1dd57644e6d6cf2723eff9a505072" ], "author": { "name": "Brett Chabot", "email": "brettchabot@android.com", "time": "Wed May 12 07:50:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:50:44 2010 -0700" }, "message": "am b4c9a8f6: Merge \"Fix imf tests.\" into froyo\n\nMerge commit \u0027b4c9a8f664f1dd57644e6d6cf2723eff9a505072\u0027 into froyo-plus-aosp\n\n* commit \u0027b4c9a8f664f1dd57644e6d6cf2723eff9a505072\u0027:\n Fix imf tests.\n" }, { "commit": "21f18e9633967e69ebe7a172b902420fec485bba", "tree": "7cd1219bcc2dfa0f66a767887fe9dc17af473eb8", "parents": [ "d522b270a90cdd5f9bdedeb402b4738cfa294ee5", "bb129dc57b4a5be24ab7c5e436fa591f61e28d3d" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:50:41 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:50:41 2010 -0700" }, "message": "am bb129dc5: docs: make Notifying the User an expandable list\n\nMerge commit \u0027bb129dc57b4a5be24ab7c5e436fa591f61e28d3d\u0027 into froyo-plus-aosp\n\n* commit \u0027bb129dc57b4a5be24ab7c5e436fa591f61e28d3d\u0027:\n docs: make Notifying the User an expandable list\n" }, { "commit": "d522b270a90cdd5f9bdedeb402b4738cfa294ee5", "tree": "3a3120b2a37c668a9a05b8d09d1f6e9510c6b6f3", "parents": [ "0130e3837638b998ff28786618bc6a7fc6417711", "a225e3b1cd02da0f748f1a8e7341c727eff28085" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:50:36 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:50:36 2010 -0700" }, "message": "am a225e3b1: docs: add quickview box with \"see also\" links for some articles\n\nMerge commit \u0027a225e3b1cd02da0f748f1a8e7341c727eff28085\u0027 into froyo-plus-aosp\n\n* commit \u0027a225e3b1cd02da0f748f1a8e7341c727eff28085\u0027:\n docs: add quickview box with \"see also\" links for some articles\n" }, { "commit": "0130e3837638b998ff28786618bc6a7fc6417711", "tree": "83ca6d6f54e4bcc7c6acc13dd050358fe55d401c", "parents": [ "d9712b69ce529fbf50b3b837032c1dc40e623381", "6bc3304b74ba41bf9fd132d48c7bb764d631d3fa" ], "author": { "name": "Scott Main", "email": "smain@google.com", "time": "Wed May 12 07:50:30 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:50:30 2010 -0700" }, "message": "am 6bc3304b: Merge \"docs: remove allowBackup attribute from documentation\" into froyo\n\nMerge commit \u00276bc3304b74ba41bf9fd132d48c7bb764d631d3fa\u0027 into froyo-plus-aosp\n\n* commit \u00276bc3304b74ba41bf9fd132d48c7bb764d631d3fa\u0027:\n docs: remove allowBackup attribute from documentation\n" }, { "commit": "d9712b69ce529fbf50b3b837032c1dc40e623381", "tree": "09f90db7ddaa8849cadc66d02ef70de1a94cc7a0", "parents": [ "bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b", "b1235a57a09174179553acecef2370354bdcbf41" ], "author": { "name": "Xavier Ducrohet", "email": "xav@android.com", "time": "Wed May 12 07:50:19 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed May 12 07:50:19 2010 -0700" }, "message": "am b1235a57: Merge \"Hide two audio focus methods.\" into froyo\n\nMerge commit \u0027b1235a57a09174179553acecef2370354bdcbf41\u0027 into froyo-plus-aosp\n\n* commit \u0027b1235a57a09174179553acecef2370354bdcbf41\u0027:\n Hide two audio focus methods.\n" } ], "next": "bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b" }