LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,053 Commits 2 Branches 0 Tags
e80cdf2adeb5420bef80566baf5fe8b40285967c
Commit Graph

6053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
d9592ea667 am 3809ac29: am 23c0080a: Import revised translations. 
* commit '3809ac29168802be1f319fdbca5b7f9cd324d4fa':
  Import revised translations.
 2011-01-26 19:09:45 -08:00
Jeff Hamilton
8dc2b87b64 am fa378cdd: am 28745b4e: am 509fbb4d: Sample code for foreground NDEF Push APIs. 
* commit 'fa378cddf30b0b50c48ee332c3f5c3bdb82baa32':
  Sample code for foreground NDEF Push APIs.
 2011-01-26 19:08:27 -08:00
Eric Fischer
3809ac2916 am 23c0080a: Import revised translations. 
* commit '23c0080a10b7ae694849cf820e55a54333d7f37a':
  Import revised translations.
 2011-01-26 17:37:34 -08:00
Jeff Hamilton
fa378cddf3 am 28745b4e: am 509fbb4d: Sample code for foreground NDEF Push APIs. 
* commit '28745b4ee52ef4864f9bdaed1d5e1cb9ac849b15':
  Sample code for foreground NDEF Push APIs.
 2011-01-26 16:57:49 -08:00
Eric Fischer
23c0080a10 Import revised translations. 
Change-Id: I4c228fcb677bf6b5a571c51bd3b030dcba4fadf0
 2011-01-26 16:47:33 -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
fb56bed85b am 85dd1735: Merge b7ea5aca to honeycomb-plus-aosp 
* commit '85dd17355c7080ca89b299db5044eaeffb4ff315':
  Current files for source.android.com
 2011-01-26 10:11:55 -08:00
Jean-Baptiste Queru
85dd17355c Merge b7ea5aca to honeycomb-plus-aosp 
Change-Id: I21074a6291cd8987f7e247c181fd02f8ad0f50d0
 2011-01-26 10:08:09 -08:00
Jeff Hamilton
a9bb7f1472 resolved conflicts for merge of ac96a560 to honeycomb-merge 
Change-Id: Ibc0b1fa69597672293f6b753f18f8a14ee732d0b
 2011-01-26 11:12:41 -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
Dianne Hackborn
a7bdb442c5 am 3de63b41: am 3be09cb1: Merge "Use multiple async tasks." into honeycomb 
* commit '3de63b416d80b1d50c6087336d0a34b2ffbe8528':
  Use multiple async tasks.
 2011-01-25 16:20:06 -08:00
Andy Stadler
9e0ca28878 am 3555b812: am dae2faa3: Fix eclipse classpath 
* commit '3555b812584634621ef424a275a772d256912f6e':
  Fix eclipse classpath
 2011-01-25 16:19:56 -08:00
Nick Pelly
78c8e27935 resolved conflicts for merge of 06bef9df to master 
Change-Id: Ie0a21c77481542f882a58418bfb7269f9c357a4a
 2011-01-25 16:11:28 -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
3de63b416d am 3be09cb1: Merge "Use multiple async tasks." into honeycomb 
* commit '3be09cb183af4e0a637a12cfb421fd90fe40d308':
  Use multiple async tasks.
 2011-01-25 15:25:43 -08:00
Dianne Hackborn
3be09cb183 Merge "Use multiple async tasks." into honeycomb 2011-01-25 15:23:59 -08:00
Andy Stadler
3555b81258 am dae2faa3: Fix eclipse classpath 
* commit 'dae2faa37be3f0f877ed946513f97ac80fa6cf3e':
  Fix eclipse classpath
 2011-01-25 15:23:37 -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
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
06bef9df0b am 7a11acd9: am e0fbd3ff: Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent. 
* commit '7a11acd92bec5e7a089bdb248a78589491962c76':
  Demo for NFC ACTION_TECHNOLOGY_DISCOVERED intent.
 2011-01-25 14:44:37 -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
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
David Turner
3ad8a53a57 am c2ddf901: am 1b20f62a: am dfb9123d: Merge "Use __asm__ instead of asm in public libc headers" 
* commit 'c2ddf901c2e45d0a63e587e0f16e77f55931b184':
  Use __asm__ instead of asm in public libc headers
 2011-01-25 11:01:23 -08:00
David Turner
c2ddf901c2 am 1b20f62a: am dfb9123d: Merge "Use __asm__ instead of asm in public libc headers" 
* commit '1b20f62a9aa8906d8a2afd5e6720a9cccb138c2e':
  Use __asm__ instead of asm in public libc headers
 2011-01-25 10:58:48 -08:00
Jean-Baptiste Queru
28cd530b27 am ad72b961: merge 6d0d0d64 from gingerbread-plus-aosp 
* commit 'ad72b96188d0a29b0669545f712e189411661bb8':
  source.android.com documentation cleanup
 2011-01-25 10:53:15 -08:00
Jean-Baptiste Queru
ad72b96188 merge 6d0d0d64 from gingerbread-plus-aosp 
Change-Id: I6b9bb3380fc74414542a8875b8afa09b391d29c2
 2011-01-25 10:50:13 -08: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
The Android Automerger
4da6559883 am 902bc7bc: resolved conflicts for merge of 42f87e1b to honeycomb-plus-aosp 
* commit '902bc7bcea710d4698ce571ac3042a5338fc94e1':
  Monkey: request am to show the ANR dialog
 2011-01-24 23:48:04 -08:00
The Android Automerger
902bc7bcea resolved conflicts for merge of 42f87e1b to honeycomb-plus-aosp 
Change-Id: Ic0ea8910670567e1725e42de76e6da0cd09decac
 2011-01-24 23:45:43 -08:00
Dianne Hackborn
649790adc5 Use multiple async tasks. 
Change-Id: If6be431a4f9443eaaf4478bae57c29f77f558b91
 2011-01-24 21:26:57 -08:00
Xavier Ducrohet
d2d33e1f48 am 8ae584ed: am d7d15831: Merge "Update the SDK platform components to API 11." into honeycomb 
* commit '8ae584edb2d0349ce42b775de795d9d35761f2da':
  Update the SDK platform components to API 11.
 2011-01-24 17:31:50 -08:00
Xavier Ducrohet
8ae584edb2 am d7d15831: Merge "Update the SDK platform components to API 11." into honeycomb 
* commit 'd7d15831d79aae53e2b7d9d402a2503e9f68dc98':
  Update the SDK platform components to API 11.
 2011-01-24 17:29:14 -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
150301ed9f am 4b7c4677: am 24e38f1b: Merge "Add WindowOrientationListener log enable/disable checkbox." into honeycomb 
* commit '4b7c4677642eb3d446924de5a52fc035c72eb7eb':
  Add WindowOrientationListener log enable/disable checkbox.
 2011-01-24 16:24:34 -08:00
Jeff Brown
4b7c467764 am 24e38f1b: Merge "Add WindowOrientationListener log enable/disable checkbox." into honeycomb 
* commit '24e38f1bef4d8600c64029ce20f9ee7d9d6201a5':
  Add WindowOrientationListener log enable/disable checkbox.
 2011-01-24 15:33:40 -08:00
Jeff Brown
24e38f1bef Merge "Add WindowOrientationListener log enable/disable checkbox." into honeycomb 2011-01-24 15:31:31 -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
Nick Pelly
93d730e5c1 am e9986191: am 1717afbc: am 072bca5b: Add Tag app to eclipse classpath 
* commit 'e99861912ce55c24cf9f0b00bedeb3941528a297':
  Add Tag app to eclipse classpath
 2011-01-24 13:36:27 -08:00
Yu Shan Emily Lau
7a1cca2c41 am ed08c126: am d391ae20: Fixed the appCrashBugreport reset flag. Bug# 3383876 
* commit 'ed08c1266cdcada2278beaf60589260beb84ac56':
  Fixed the appCrashBugreport reset flag. Bug# 3383876
 2011-01-24 13:32:39 -08:00
Jeff Brown
90cd4f49ae am 48bab43f: (-s ours) am f40ea5cf: (-s ours) am 98ab3219: Prevent monkey from turning off the screen. (DO NOT MERGE) 
* commit '48bab43f1b0cd0b4c2994a71890d52b5ac0a9f33':
  Prevent monkey from turning off the screen. (DO NOT MERGE)
 2011-01-24 13:29:19 -08:00
Nick Pelly
e99861912c am 1717afbc: am 072bca5b: Add Tag app to eclipse classpath 
* commit '1717afbca4361cc190d3a3098c4ffce6ddb443f0':
  Add Tag app to eclipse classpath
 2011-01-24 13:23:48 -08:00
Yu Shan Emily Lau
ed08c1266c am d391ae20: Fixed the appCrashBugreport reset flag. Bug# 3383876 
* commit 'd391ae20984ff1323b8d59c8dcfdda18154b957d':
  Fixed the appCrashBugreport reset flag. Bug# 3383876
 2011-01-24 12:28:40 -08:00