Commit Graph

4441 Commits

Author SHA1 Message Date
The Android Automerger
3c0533bba6 merge in gingerbread-release history after reset to gingerbread 2011-03-16 05:43:28 -07:00
The Android Automerger
bb6f5c8c4d merge in gingerbread-release history after reset to gingerbread 2011-03-14 22:33:30 -07:00
The Android Automerger
21696b004d merge in gingerbread-release history after reset to gingerbread 2011-03-12 11:56:03 -08:00
The Android Automerger
a4cada567d merge in gingerbread-release history after reset to gingerbread 2011-03-11 10:35:15 -08:00
Ying Wang
1a6a849bcb Disable ccache when use mingw.
Change-Id: Ieff363f9c4433bba53d1e94a25477c60933666e2
2011-03-10 18:25:51 -08:00
The Android Automerger
19742f3e60 merge in gingerbread-release history after reset to gingerbread 2011-03-09 08:53:49 -08:00
The Android Automerger
a19e7705d7 merge in gingerbread-release history after reset to gingerbread 2011-03-07 16:39:57 -08:00
The Android Automerger
96e8fd9676 merge in gingerbread-release history after reset to gingerbread 2011-03-04 21:56:37 -08:00
The Android Automerger
3b04870b72 merge in gingerbread-release history after reset to gingerbread 2011-03-04 17:41:45 -08:00
The Android Automerger
489d17bfd3 merge in gingerbread-release history after reset to gingerbread 2011-03-03 14:17:37 -08:00
Raphael
5eafc91ad3 Merge "merge "SDK: make 'mkstub' less verbose." from HC. Do not merge." into gingerbread 2011-02-04 14:46:24 -08:00
Raphael
b82fbc6442 merge "SDK: make 'mkstub' less verbose." from HC. Do not merge.
mkstub is the tool used to stub the google_apis maps.jar.
Since we're integrating it in the build, we want to control its verbosity.

Change-Id: I93d7dc6a63426affac008f8ef367a0d79277b59a
2011-02-04 12:35:17 -08:00
Xavier Ducrohet
1cedfdb031 Update samples API level. DO NOT MERGE
Change-Id: Ib6a27e5abcb7cb767dae31c67445b450705ae9af
2011-02-04 12:27:11 -08:00
The Android Automerger
a7f9cf48c2 merge in gingerbread-release history after reset to gingerbread 2011-02-03 14:23:54 -08:00
The Android Automerger
de88b55780 merge in gingerbread-release history after reset to gingerbread 2011-02-02 18:29:33 -08:00
The Android Automerger
0e45e71cdd merge in gingerbread-release history after reset to gingerbread 2011-02-02 17:44:46 -08:00
Nick Pelly
c2860adcb8 Update sample app for final GB MR API changes.
Change-Id: Ic6b7aa2ffe88f6a9228322d41a2be391eb5bf545
2011-02-01 08:25:46 -08:00
The Android Automerger
6c70c3e654 merge in gingerbread-release history after reset to gingerbread 2011-01-30 16:03:02 -08:00
The Android Automerger
4b40d9e57a merge in gingerbread-release history after reset to gingerbread 2011-01-28 14:44:57 -08:00
Raphael
1adaa57108 unix2dos command, used by win SDK, has been renamed under Lucid.
Note: this fix was already in master.

Change-Id: I7935093ef4a01181f7239e9aeeef4792ee0b54cc
2011-01-27 14:00:21 -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
The Android Automerger
2ba43daeb7 merge in gingerbread-release history after reset to gingerbread 2011-01-26 18:55:17 -08:00
Jeff Hamilton
509fbb4df3 Sample code for foreground NDEF Push APIs. 2011-01-26 17:41:35 -06:00
The Android Automerger
5b6f6c350b merge in gingerbread-release history after reset to gingerbread 2011-01-26 15:12:58 -08:00
Jeff Hamilton
e0fbd3ffe8 Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
Change-Id: Ic537d209b07e81e80aeca5aa3e4a63657ac6fb76
2011-01-25 16:33:33 -06:00
Nick Pelly
072bca5b09 Add Tag app to eclipse classpath
Change-Id: Ib548b6a1bfa073069bba8d4225768b048192916e
2011-01-21 10:12:17 -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
The Android Automerger
92e9b9043b merge in gingerbread-release history after reset to gingerbread 2011-01-20 17:20:48 -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
5e38995f6a Merge "Add BasicGLSurfaceView sample." into gingerbread 2011-01-17 17:39:43 -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
The Android Automerger
caec8df27e merge in gingerbread-release history after reset to gingerbread 2011-01-16 16:21:57 -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
The Android Automerger
7fe0eab6d7 merge in gingerbread-release history after reset to gingerbread 2011-01-16 08:53:30 -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
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
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
The Android Automerger
8ebd97eaef merge in gingerbread-release history after reset to gingerbread 2011-01-14 07:48:39 -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
The Android Automerger
cd4e525cfb merge in gingerbread-release history after reset to gingerbread 2011-01-13 07:48:14 -08:00
The Android Automerger
12fd18451c merge in gingerbread-release history after reset to gingerbread 2011-01-12 07:20:55 -08: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
The Android Automerger
9ae5477a16 merge in gingerbread-release history after reset to gingerbread 2011-01-11 07:34:42 -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
The Android Automerger
564e51a686 merge in gingerbread-release history after reset to gingerbread 2011-01-10 07:39:38 -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
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
Raphael
89ee8c72f3 Merge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread 2011-01-07 01:22:18 -08:00
The Android Automerger
f6334ca5ce merge in gingerbread-release history after reset to gingerbread 2011-01-06 17:24:14 -08:00