The Android Automerger
|
c315bf8583
|
merge in honeycomb-release history after reset to honeycomb
|
2011-02-01 10:11:45 -08:00 |
|
The Android Automerger
|
6425a1b793
|
merge in honeycomb-release history after reset to honeycomb
|
2011-01-31 17:24:10 -08:00 |
|
Xavier Ducrohet
|
75b7bb2521
|
Add Clang includes to the SDK for Renderscript
Change-Id: I247f5c1480799868792871ea68c7765fbbc01fa6
|
2011-01-31 16:37:33 -08:00 |
|
The Android Automerger
|
6446bb69ec
|
merge in honeycomb-release history after reset to honeycomb
|
2011-01-30 13:37:22 -08:00 |
|
The Android Open Source Project
|
88f1271196
|
Mass merge from gingerbread - do not merge
Change-Id: I1fadb096a42c4905d243428a91025ecb759443cc
|
2011-01-30 12:39:58 -08:00 |
|
The Android Automerger
|
032e0a67ba
|
merge in honeycomb-release history after reset to honeycomb
|
2011-01-30 09:58:35 -08:00 |
|
Jean-Baptiste Queru
|
ce2fdae0e6
|
Merge 1adaa571 from gingerbread
Change-Id: Ic4be80eea5331f2b32b507dd6546b86383306f94
|
2011-01-29 11:13:54 -08:00 |
|
Xavier Ducrohet
|
8f823fd4a4
|
am 82be0899: (-s ours) Update platform version for SDK component. DO NOT MERGE.
* commit '82be08990bc73134ae8b0e2a7e94e2a28a82d675':
Update platform version for SDK component. DO NOT MERGE.
|
2011-01-29 10:39:56 -08:00 |
|
Jeff Hamilton
|
59592336d5
|
am 509fbb4d: Sample code for foreground NDEF Push APIs.
* commit '509fbb4df3bdbc8c78614f5297459f7afe2b1ba6':
Sample code for foreground NDEF Push APIs.
|
2011-01-29 09:55:03 -08:00 |
|
Jeff Hamilton
|
6a16ba335f
|
am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
* commit 'e0fbd3ffe82e6e80c6b070c3afbdb8e7fdd9bb25':
Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
|
2011-01-29 09:32:16 -08:00 |
|
The Android Automerger
|
408d6d7f22
|
merge in honeycomb-release history after reset to honeycomb
|
2011-01-28 15:48:45 -08:00 |
|
Scott Main
|
82b3a46cad
|
set minsdkversion for hc demo to 11
Change-Id: I21bdf56424fe1f63cad1c8e99fb6285ecbfc28f4
|
2011-01-28 11:22:09 -08:00 |
|
The Android Automerger
|
6cd9164a75
|
merge in honeycomb-release history after reset to honeycomb
|
2011-01-28 07:24:45 -08:00 |
|
Dianne Hackborn
|
c6572ed63d
|
Merge "Add new samples for explicit alert dialog themes." into honeycomb
|
2011-01-27 22:47:21 -08:00 |
|
Nick Pelly
|
b41b0e5b13
|
am 072bca5b: Add Tag app to eclipse classpath
* commit '072bca5b0991c2b4ddbd058ff51fe7f52cb11177':
Add Tag app to eclipse classpath
|
2011-01-27 21:43:02 -08:00 |
|
Jeff Brown
|
a08ba29823
|
am 98ab3219: (-s ours) Prevent monkey from turning off the screen. (DO NOT MERGE)
* commit '98ab321927f1ea9ebb7ba6b5506ac6748b005555':
Prevent monkey from turning off the screen. (DO NOT MERGE)
|
2011-01-27 21:21:07 -08:00 |
|
Alexander Lucas
|
a029474d6c
|
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-27 18:28:36 -08:00 |
|
Dianne Hackborn
|
e36d13b70d
|
Add new samples for explicit alert dialog themes.
Change-Id: I1e306c0786952ab391c479a9322065efd8566ca7
|
2011-01-27 16:35:02 -08:00 |
|
Scott Main
|
44a6ed7b3f
|
Merge "change notepad min sdk version to 11 and adjust action item appearance" into honeycomb
|
2011-01-27 15:02:52 -08:00 |
|
Scott Main
|
29ecb2f11d
|
change notepad min sdk version to 11 and adjust action item appearance
Change-Id: I5385067b2720ebb053565cadcfe725103165abb8
|
2011-01-27 14:58:55 -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 |
|
Jack Palevich
|
536d8b9f78
|
am 5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
* commit '5e38995f6af6339e5dccf86b50f8b658917c7aeb':
Add BasicGLSurfaceView sample.
|
2011-01-27 09:18:16 -08:00 |
|
Xavier Ducrohet
|
ae760d9489
|
am 7eada540: (-s ours) 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-27 08:48:40 -08:00 |
|
Jaikumar Ganesh
|
5a87804c87
|
am 1b608620: (-s ours) 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-27 08:12:00 -08:00 |
|
Elliott Hughes
|
71dbb060ca
|
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-27 08:10:42 -08:00 |
|
The Android Automerger
|
30013a64e2
|
merge in honeycomb-release history after reset to honeycomb
|
2011-01-27 07:25:37 -08:00 |
|
Jeff Hamilton
|
71a96a345a
|
am aad3a1b7: Add a sample for the NFC foreground dispatch APIs.
* commit 'aad3a1b7327491f29db69a4e4bf7c3791662d6b5':
Add a sample for the NFC foreground dispatch APIs.
|
2011-01-26 21:14:42 -08:00 |
|
Eric Fischer
|
23c0080a10
|
Import revised translations.
Change-Id: I4c228fcb677bf6b5a571c51bd3b030dcba4fadf0
|
2011-01-26 16:47:33 -08:00 |
|
Jeff Hamilton
|
509fbb4df3
|
Sample code for foreground NDEF Push APIs.
|
2011-01-26 17:41:35 -06:00 |
|
Jeff Hamilton
|
a9bb7f1472
|
resolved conflicts for merge of ac96a560 to honeycomb-merge
Change-Id: Ibc0b1fa69597672293f6b753f18f8a14ee732d0b
|
2011-01-26 11:12:41 -06:00 |
|
The Android Automerger
|
995f6c4918
|
merge in honeycomb-release history after reset to honeycomb
|
2011-01-26 07:25:43 -08:00 |
|
Raphael
|
24dee78082
|
am f823ebad: (-s ours) 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-25 15:52:23 -08:00 |
|
Xavier Ducrohet
|
0ad1c69d30
|
am daf0b895: (-s ours) Cherry-pick f0e5e933 from master.
* commit 'daf0b895e8e0c952cc8563972d74a5e06fba7d0b':
Cherry-pick f0e5e933 from master.
|
2011-01-25 15:39:11 -08:00 |
|
Dianne Hackborn
|
3be09cb183
|
Merge "Use multiple async tasks." into honeycomb
|
2011-01-25 15:23:59 -08:00 |
|
Raphael
|
27fc0176e4
|
am 89ee8c72: (-s ours) Merge "SDK for 2.3.1 -- DO NOT MERGE" into gingerbread
* commit '89ee8c72f35907a3546fb067eef2bdc8e134d53b':
SDK for 2.3.1 -- DO NOT MERGE
|
2011-01-25 15:21:18 -08:00 |
|
Andy Stadler
|
dae2faa37b
|
Fix eclipse classpath
* Remove AccountsAndSyncSettings
* Add bouncycastle_intermediates/classes-jarjar.jar
Change-Id: I7bab0a0abd4513a01fe8b633c71876b3e23e86ed
|
2011-01-25 15:20:45 -08:00 |
|
Jeff Hamilton
|
e0fbd3ffe8
|
Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
Change-Id: Ic537d209b07e81e80aeca5aa3e4a63657ac6fb76
|
2011-01-25 16:33:33 -06:00 |
|
Eric Fischer
|
56326d5f38
|
am 01f08464: (-s ours) Import translations for additional languages.
* commit '01f0846415ed75a8e30a26bf5e064c46025df2eb':
Import translations for additional languages.
|
2011-01-25 12:52:19 -08:00 |
|
The Android Automerger
|
50b8cc4fcf
|
merge in honeycomb-release history after reset to honeycomb
|
2011-01-25 07:24:19 -08:00 |
|
Dianne Hackborn
|
649790adc5
|
Use multiple async tasks.
Change-Id: If6be431a4f9443eaaf4478bae57c29f77f558b91
|
2011-01-24 21:26:57 -08:00 |
|
Xavier Ducrohet
|
d7d15831d7
|
Merge "Update the SDK platform components to API 11." into honeycomb
|
2011-01-24 17:26:12 -08:00 |
|
Xavier Ducrohet
|
c177f55e12
|
Update the SDK platform components to API 11.
Change-Id: I17f202c986ca0a27e89f02430bb2400eaa85c534
|
2011-01-24 17:25:36 -08:00 |
|
Jeff Brown
|
24e38f1bef
|
Merge "Add WindowOrientationListener log enable/disable checkbox." into honeycomb
|
2011-01-24 15:31:31 -08:00 |
|
Yu Shan Emily Lau
|
d391ae2098
|
Fixed the appCrashBugreport reset flag. Bug# 3383876
Change-Id: I51d06ad30ed43789943cc99744898028e11b8466
|
2011-01-24 11:57:32 -08:00 |
|
The Android Automerger
|
a53e739a80
|
merge in honeycomb-release history after reset to honeycomb
|
2011-01-24 07:21:59 -08:00 |
|
Jeff Brown
|
2559c31618
|
Add WindowOrientationListener log enable/disable checkbox.
Change-Id: I1107eb39a72b42ddc97e611c3fc33c3997ed49cd
|
2011-01-23 14:57:12 -08:00 |
|
Dianne Hackborn
|
7c69dba7cc
|
Remove use of old theme name.
Change-Id: Iebc7a81738122fbfb94f22649e07eabb39dc4afb
|
2011-01-23 14:10:41 -08:00 |
|
The Android Automerger
|
66c7cec855
|
merge in honeycomb-release history after reset to honeycomb
|
2011-01-23 07:21:15 -08:00 |
|
The Android Automerger
|
0f3068c8d6
|
merge in honeycomb-release history after reset to honeycomb
|
2011-01-22 07:22:50 -08:00 |
|