mnstshlylh
Fork| Rev. | 时间 | 作者 |
|---|---|---|
| 88fa73b | 2011-01-31 05:53:36 | The Android Open Source Project |
|
am 9f0fe782: Reconcile gingerbread-plus-aosp and honeycomb |
||
| 9f0fe78 | 2011-01-31 05:39:58 | The Android Open Source Project |
|
Reconcile gingerbread-plus-aosp and honeycomb |
||
| 88f1271 | 2011-01-31 05:39:58 | The Android Open Source Project |
|
Mass merge from gingerbread - do not merge |
||
| ce2fdae | 2011-01-30 04:13:54 | Jean-Baptiste Queru |
|
Merge 1adaa571 from gingerbread |
||
| 8f823fd | 2011-01-30 03:39:56 | Xavier Ducrohet |
|
am 82be0899: (-s ours) Update platform version for SDK component. DO NOT MERGE. |
||
| 5959233 | 2011-01-30 02:55:03 | Jeff Hamilton |
|
am 509fbb4d: Sample code for foreground NDEF Push APIs. |
||
| 8ae5cf7 | 2011-01-30 02:37:34 | Jean-Baptiste Queru |
|
am ebcbca43: (-s ours) am 8efcfb5d: (-s ours) am c8fd87e4: Delete browserplugin sample. do not merge |
||
| ebcbca4 | 2011-01-30 02:35:57 | Jean-Baptiste Queru |
|
am 8efcfb5d: (-s ours) am c8fd87e4: Delete browserplugin sample. do not merge |
||
| 6a16ba3 | 2011-01-30 02:32:16 | Jeff Hamilton |
|
am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent. |
||
| ff22514 | 2011-01-30 02:00:30 | Raphael |
|
am b24ee05b: am 6a691b3e: resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp |
||
| b24ee05 | 2011-01-30 01:56:53 | Raphael |
|
am 6a691b3e: resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp |
||
| 496e7c0 | 2011-01-30 01:35:34 | Jean-Baptiste Queru |
|
am 9ed77afe: (-s ours) am b35e113c: (-s ours) am 2d81c413: am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge" |
||
| 9ed77af | 2011-01-30 01:03:16 | Jean-Baptiste Queru |
|
am b35e113c: (-s ours) am 2d81c413: am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge" |
||
| 8efcfb5 | 2011-01-30 01:00:48 | Jean-Baptiste Queru |
|
am c8fd87e4: Delete browserplugin sample. do not merge |
||
| c8fd87e | 2011-01-30 00:38:51 | Jean-Baptiste Queru |
|
Delete browserplugin sample. do not merge |
||
| 9ef185f | 2011-01-29 11:09:20 | Christopher Tate |
|
Merge "The drag/drop ApiDemo now uses a global drag, not local-only" |
||
| 796df3b | 2011-01-29 11:08:53 | Christopher Tate |
|
The drag/drop ApiDemo now uses a global drag, not local-only |
||
| 4b40d9e | 2011-01-29 07:44:57 | The Android Automerger |
|
merge in gingerbread-release history after reset to gingerbread |
||
| ecea33f | 2011-01-29 06:28:00 | Ying Wang |
|
Pass down showcommands to the recursive make of winsdk. |
||
| f1458cd | 2011-01-29 04:58:03 | Scott Main |
|
am f8faaaf1: am 82b3a46c: set minsdkversion for hc demo to 11 |
||
| f8faaaf | 2011-01-29 04:56:34 | Scott Main |
|
am 82b3a46c: set minsdkversion for hc demo to 11 |
||
| 82b3a46 | 2011-01-29 04:22:09 | Scott Main |
|
set minsdkversion for hc demo to 11 |
||
| ae619ca | 2011-01-29 02:30:25 | Xavier Ducrohet |
|
am 9eef4708: (-s ours) am f3569612: (-s ours) am 82be0899: Update platform version for SDK component. DO NOT MERGE. |
||
| 9eef470 | 2011-01-29 02:25:35 | Xavier Ducrohet |
|
am f3569612: (-s ours) am 82be0899: Update platform version for SDK component. DO NOT MERGE. |
||
| 31aae48 | 2011-01-28 15:53:09 | Dianne Hackborn |
|
am 9d31b407: am c6572ed6: Merge "Add new samples for explicit alert dialog themes." into honeycomb |
||
| 9d31b40 | 2011-01-28 15:50:48 | Dianne Hackborn |
|
am c6572ed6: Merge "Add new samples for explicit alert dialog themes." into honeycomb |
||
| c6572ed | 2011-01-28 15:47:21 | Dianne Hackborn |
|
Merge "Add new samples for explicit alert dialog themes." into honeycomb |
||
| 6a691b3 | 2011-01-28 14:46:19 | Raphael |
|
resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp |
||
| b41b0e5 | 2011-01-28 14:43:02 | Nick Pelly |
|
am 072bca5b: Add Tag app to eclipse classpath |
||
| a08ba29 | 2011-01-28 14:21:07 | Jeff Brown |
|
am 98ab3219: (-s ours) Prevent monkey from turning off the screen. (DO NOT MERGE) |
||
