Jean-Baptiste Queru
b35e113cef
am 2d81c413: am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge"
...
* commit '2d81c413c7b0a1206aae4e45d6dd2bbae0584436':
Delete browserplugin sample. do not merge
2011-01-27 15:08:13 -08:00
Jean-Baptiste Queru
2d81c413c7
am d9af3ac3: (-s ours) Merge "Delete browserplugin sample. do not merge"
...
* commit 'd9af3ac3e2f9f61d541e5c15c3d47bd8e0e6def5':
Delete browserplugin sample. do not merge
2011-01-27 15:04:57 -08:00
Jean-Baptiste Queru
d9af3ac3e2
Merge "Delete browserplugin sample. do not merge"
2011-01-27 14:42:23 -08:00
Jean-Baptiste Queru
dede009a98
Delete browserplugin sample. do not merge
...
It doesn't build in all environments.
Change-Id: Ib27b73a0f74a79e4138bb128f643206e37f5ea60
2011-01-27 13:35:26 -08:00
Xavier Ducrohet
f356961278
am 82be0899: Update platform version for SDK component. DO NOT MERGE.
...
* commit '82be08990bc73134ae8b0e2a7e94e2a28a82d675':
Update platform version for SDK component. DO NOT MERGE.
2011-01-27 13:26:06 -08:00
Xavier Ducrohet
82be08990b
Update platform version for SDK component. DO NOT MERGE.
...
Change-Id: I29b8e2345c3c5637839099adf3433e784992e8bb
2011-01-27 10:34:25 -08:00
Jeff Hamilton
28745b4ee5
am 509fbb4d: Sample code for foreground NDEF Push APIs.
...
* commit '509fbb4df3bdbc8c78614f5297459f7afe2b1ba6':
Sample code for foreground NDEF Push APIs.
2011-01-26 15:47:51 -08:00
Jeff Hamilton
509fbb4df3
Sample code for foreground NDEF Push APIs.
2011-01-26 17:41:35 -06:00
Jean-Baptiste Queru
b7ea5aca58
am 475bb357: Merge "Current files for source.android.com"
...
* commit '475bb357dbab0d1a93e489a8213843ab984ae95f':
Current files for source.android.com
2011-01-26 09:01:56 -08:00
Jean-Baptiste Queru
475bb357db
Merge "Current files for source.android.com"
2011-01-26 08:23:47 -08:00
Jean-Baptiste Queru
a6db53f077
Current files for source.android.com
...
This matches the current state of the live site.
Change-Id: If209bc337d31cf8669e2afb78c9b52e5bbe3cdac
2011-01-25 15:16:28 -08:00
Jeff Hamilton
7a11acd92b
am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
...
* commit 'e0fbd3ffe82e6e80c6b070c3afbdb8e7fdd9bb25':
Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
2011-01-25 14:39:53 -08:00
Jeff Hamilton
e0fbd3ffe8
Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
...
Change-Id: Ic537d209b07e81e80aeca5aa3e4a63657ac6fb76
2011-01-25 16:33:33 -06:00
David Turner
1b20f62a9a
am dfb9123d: Merge "Use __asm__ instead of asm in public libc headers"
...
* commit 'dfb9123d750437d050fcbbd7d64e18bf44011234':
Use __asm__ instead of asm in public libc headers
2011-01-25 09:28:59 -08:00
David Turner
dfb9123d75
Merge "Use __asm__ instead of asm in public libc headers"
2011-01-25 08:49:13 -08:00
Jean-Baptiste Queru
6d0d0d644a
am a8d817c9: Merge "source.android.com documentation cleanup"
...
* commit 'a8d817c9fc93692fac01f6df253a3712e0cf4e34':
source.android.com documentation cleanup
2011-01-24 15:27:50 -08:00
Jean-Baptiste Queru
a8d817c9fc
Merge "source.android.com documentation cleanup"
2011-01-24 15:13:08 -08:00
Dianne Hackborn
42f87e1b47
am e6354845: Merge "Monkey: request am to show the ANR dialog"
...
* commit 'e635484562dc7f21aa16de3147a100210708c8f8':
Monkey: request am to show the ANR dialog
2011-01-22 11:52:53 -08:00
Dianne Hackborn
e635484562
Merge "Monkey: request am to show the ANR dialog"
2011-01-22 11:36:43 -08:00
Vairavan Srinivasan
af5e575643
Monkey: request am to show the ANR dialog
...
Default return value of 1 from appNotResponding was to show the
ANR dialog in eclair. However, recent version of android's am
interpret 1 as to wait. Fix is to change the default return
value from 1 to 0.
Change-Id: I6620ef54309f1d30ef18a2b60d73b346c2446f93
2011-01-21 18:00:52 -08:00
Nick Pelly
1717afbca4
am 072bca5b: Add Tag app to eclipse classpath
...
* commit '072bca5b0991c2b4ddbd058ff51fe7f52cb11177':
Add Tag app to eclipse classpath
2011-01-21 10:51:18 -08:00
Nick Pelly
072bca5b09
Add Tag app to eclipse classpath
...
Change-Id: Ib548b6a1bfa073069bba8d4225768b048192916e
2011-01-21 10:12:17 -08:00
Jeff Brown
f40ea5cfd9
am 98ab3219: Prevent monkey from turning off the screen. (DO NOT MERGE)
...
* commit '98ab321927f1ea9ebb7ba6b5506ac6748b005555':
Prevent monkey from turning off the screen. (DO NOT MERGE)
2011-01-20 21:46:27 -08:00
Jeff Brown
98ab321927
Prevent monkey from turning off the screen. (DO NOT MERGE)
...
Bug: 3371251
Change-Id: I33005005fadc0f994f39fded10faafe21116f82a
2011-01-20 17:54:53 -08:00
Skyler Kaufman
8215de789a
am e2a6258c: Merge "A tiny http server to test source.android.com changes"
...
* commit 'e2a6258c42eba4c4f6aeb33872034a17275f0c89':
A tiny http server to test source.android.com changes
2011-01-19 09:53:02 -08:00
Skyler Kaufman
f7ac2a3517
source.android.com documentation cleanup
...
Download and build instructions for AOSP updated from stone age to
Gingerbread era.
Change-Id: Ic7eff1618bafa182d411c0f02efe1acfbe83724c
2011-01-19 09:38:33 -08:00
Skyler Kaufman
e2a6258c42
Merge "A tiny http server to test source.android.com changes"
2011-01-19 09:34:34 -08:00
Alexander Lucas
32d902cd11
am a0575674: Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
...
* commit 'a057567484888f206cd70ecc2dcb269b16f23718':
For SipDemo sample code: Changed chosen image for "selected" state of talk button
2011-01-18 18:07:11 -08:00
Alexander Lucas
a057567484
Merge "For SipDemo sample code: Changed chosen image for "selected" state of talk button" into gingerbread
2011-01-18 18:04:38 -08:00
Jack Palevich
2fd4288383
am 5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
...
* commit '5e38995f6af6339e5dccf86b50f8b658917c7aeb':
Add BasicGLSurfaceView sample.
2011-01-17 17:42:56 -08:00
Jack Palevich
5e38995f6a
Merge "Add BasicGLSurfaceView sample." into gingerbread
2011-01-17 17:39:43 -08:00
Xavier Ducrohet
8841bf1d41
am 7eada540: Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
...
* commit '7eada54037b5476bfc1cc4a3e8933defa0b04096':
Move SDK component to 2.4 - DO NOT MERGE.
2011-01-16 19:42:37 -08:00
Xavier Ducrohet
7eada54037
Merge "Move SDK component to 2.4 - DO NOT MERGE." into gingerbread
2011-01-16 19:38:51 -08:00
Xavier Ducrohet
22f3c41f71
Move SDK component to 2.4 - DO NOT MERGE.
...
Change-Id: Ibee46cfa081d81a7cc12f9b81ec0a3637f5b487f
2011-01-16 15:23:50 -08:00
Jack Palevich
2f6e41d664
Add BasicGLSurfaceView sample.
...
Show how to get started with OpenGL ES 2.0.
Change-Id: I22e5e72114fd76bb7319c51e0a3b0d0e05c546fb
2011-01-14 19:27:56 -08:00
Jaikumar Ganesh
0d799e0964
am 1b608620: Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
...
* commit '1b6086207f2b06fb2647428e6210c2aefc6a930a':
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
2011-01-14 16:13:36 -08:00
Jaikumar Ganesh
1b6086207f
Merge "Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API." into gingerbread
2011-01-14 16:11:35 -08:00
Elliott Hughes
47081d8f58
am ed6b76c6: Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
...
* commit 'ed6b76c670658390a43e199f9dc199d85483300a':
Minor doc fixes (mainly the infamous "repo init-u").
2011-01-14 14:21:04 -08:00
Elliott Hughes
ed6b76c670
Merge "Minor doc fixes (mainly the infamous "repo init-u")." into gingerbread
2011-01-14 14:19:03 -08:00
Jaikumar Ganesh
6314c20eeb
Do Not Merge: Modify Bluetooth Chat app for new insecure rfcomm API.
...
Also fix some bugs.
Bug: 3352266
Change-Id: Ie64cb243159b1f6eea5f268f02a1dd58970d1e22
2011-01-14 13:11:34 -08:00
Jean-Baptiste Queru
99bc9c3144
A tiny http server to test source.android.com changes
...
Change-Id: I30be7674c0417a111eceef1ed10568a864217773
2011-01-14 09:13:33 -08:00
Jeff Hamilton
e8b4ac2e6d
am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
...
* commit 'aad3a1b7327491f29db69a4e4bf7c3791662d6b5':
Add a sample for the NFC foreground dispatch APIs.
2011-01-13 12:46:08 -08:00
Jeff Hamilton
aad3a1b732
Add a sample for the NFC foreground dispatch APIs.
...
Change-Id: Iee532d53b4d9354977414b0302b386a940606ab3
2011-01-13 14:39:58 -06:00
Elliott Hughes
c8887c191a
Minor doc fixes (mainly the infamous "repo init-u").
...
Bug: http://code.google.com/p/android/issues/detail?id=8769
Change-Id: I6924baf82cc6939ba51e0b01af1f5f3c56106a5d
2011-01-11 18:10:17 -08:00
Scott Main
c8e1257329
am ac96a560: Merge "update notepad menu icons with new styles for GB (20% smaller)" into gingerbread
...
* commit 'ac96a5607de2fd643bdf43e1711aea8afa74c04b':
update notepad menu icons with new styles for GB (20% smaller)
2011-01-10 13:36:20 -08:00
Scott Main
ac96a5607d
Merge "update notepad menu icons with new styles for GB (20% smaller)" into gingerbread
2011-01-10 13:33:08 -08:00
Raphael
765487f381
am f823ebad: Switch GB SDK to 2.4 / API 10. Do not merge.
...
* commit 'f823ebad02e2d699490dc7e975054146c67251cc':
Switch GB SDK to 2.4 / API 10. Do not merge.
2011-01-10 11:03:59 -08:00
Raphael
f823ebad02
Switch GB SDK to 2.4 / API 10. Do not merge.
...
Change-Id: I8e3c97c5c281b05e2e03b6739221ea8b13536bd3
2011-01-07 16:08:05 -08:00
Xavier Ducrohet
8bd511218d
am daf0b895: Cherry-pick f0e5e933 from master.
...
* commit 'daf0b895e8e0c952cc8563972d74a5e06fba7d0b':
Cherry-pick f0e5e933 from master.
2011-01-07 13:50:42 -08:00
Xavier Ducrohet
daf0b895e8
Cherry-pick f0e5e933 from master.
...
Move emulator skins to development.git
Also added new default RAM config to the skins.
Change-Id: I520c485f4ef9f6d9d2eea126ed46d96b5fc3e785
2011-01-07 13:03:22 -08:00