Commit Graph

20452 Commits

Author SHA1 Message Date
Andreas Huber
38519517c5 am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed':
  DO NOT MERGE: Respond to RTSP server->client requests.
2011-02-16 14:24:53 -08:00
Robert Greenwalt
c6ef3a4c15 am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
* commit '3259d8853760a72b811757e1711119d041962a1c':
  DO NOT MERGE - backport of l92a02b31 from master
2011-02-16 10:51:04 -08:00
Robert Greenwalt
b9ce99c940 Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread 2011-02-16 10:44:26 -08:00
Alon Albert
92b31b9c0b am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
  DO NOT MERGE - Clear backoffs on reconnect
2011-02-16 10:24:15 -08:00
Alon Albert
b088416f08 Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread 2011-02-16 10:20:13 -08:00
daniel_tomas
380b267bf3 am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
* commit '7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
  New API added in NfcAdapter to enable/disable SE card emulation
2011-02-16 09:41:00 -08:00
Nick Pelly
a112a94833 am 1df862a4: Minor doc update.
* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
  Minor doc update.
2011-02-16 09:23:08 -08:00
Andreas Huber
d145fc1770 am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
* commit '8db7a7bfadc7bdfa30f60bb06063f91b19234096':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
2011-02-16 09:02:08 -08:00
Andreas Huber
071969e5d3 Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread 2011-02-16 08:50:37 -08:00
Robert Ly
3520ddc132 am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
* commit '4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
  Adding package summary for nfc.tech package
2011-02-15 22:54:52 -08:00
Robert Ly
08f2087b06 Merge "Adding package summary for nfc.tech package" into gingerbread 2011-02-15 17:44:56 -08:00
John Wang
e85d8d6620 am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
  Only decode EXT1 tag when it is available.
2011-02-15 12:38:38 -08:00
John Wang
6ac7359b83 Merge "Only decode EXT1 tag when it is available." into gingerbread 2011-02-15 12:34:37 -08:00
Andreas Huber
81147459b8 am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
* commit 'd1ba051a465518fa4325c364ed77025fc1a2a794':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
2011-02-15 11:49:03 -08:00
Scott Main
1f14e87b4c am d4952380: fix md5sum for windows installer
* commit 'd49523809714b04636a9ac43de1c508ed1dbfc38':
  fix md5sum for windows installer
2011-02-14 09:14:12 -08:00
Robert Ly
6619488871 am 322891c6: Doc change: nfc dev guide
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
  Doc change: nfc dev guide
2011-02-11 13:18:31 -08:00
Jean-Baptiste Queru
fd32f41763 am 6901f963: am 93552de8: Merge "stubs"
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
  stubs
2011-02-11 10:04:53 -08:00
Jean-Baptiste Queru
a240734bae am 93552de8: Merge "stubs"
* commit '93552de8e305027fb003401e347b9493c64c981f':
  stubs
2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
3edab5a44e Merge "stubs" 2011-02-11 09:39:46 -08:00
Steve Block
58c40337d0 stubs
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
2011-02-11 09:33:40 -08:00
Gilles Debunne
4dffae1718 am 2050de5b: Text selection is broken.
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
  Text selection is broken.
2011-02-09 16:49:42 -08:00
Wink Saville
614a618526 am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
  Telephony: Fix cb sms implementation
2011-02-09 13:45:37 -08:00
Wink Saville
76615d7b6f am 6e25789f: Merge "Telephony: Fix cb sms implementation"
* commit '6e25789fbe7ac283021156b17f406acb48850292':
  Telephony: Fix cb sms implementation
2011-02-09 13:42:45 -08:00
Wink Saville
0db20b9d86 Merge "Telephony: Fix cb sms implementation" 2011-02-09 13:09:24 -08:00
Mathias Agopian
4ed86b8f5c am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
* commit 'ada1b6f297596cac4451edbc83df060a31cdda68':
  fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-09 13:09:12 -08:00
Mathias Agopian
6cb8fc11ee Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread 2011-02-09 13:06:00 -08:00
Scott Main
32904147c2 am 07cefd3c: add 2.3.3 announcement to site home page
* commit '07cefd3cc3d8d27750e4fc725d9aec86250750dd':
  add 2.3.3 announcement to site home page
2011-02-09 13:03:11 -08:00
Jeff Hamilton
1ce30b2dfa am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
  More documentation updates for NFC.
2011-02-09 00:36:53 -08:00
Jeff Hamilton
0858b00d05 Merge "More documentation updates for NFC." into gingerbread 2011-02-09 00:34:22 -08:00
Dirk Dougherty
714319b575 am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
* commit 'a3f53afd13bc1722464e169cb82a01d3898852b5':
  Doc change: Add version notes for Android 2.3.3.
2011-02-08 23:27:53 -08:00
Nick Pelly
3d7a394315 am 39cf3a44: Document NFC permissions.
* commit '39cf3a445e507f219ecc8a476f6038f095d9d520':
  Document NFC permissions.
2011-02-08 23:25:29 -08:00
Dirk Dougherty
6e0c56dfe3 Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread 2011-02-08 23:24:22 -08:00
Jeff Hamilton
b9e98d8c6a am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread
* commit '584afa8dde1777b181e773a491416769f25607a8':
  Improve the docs a bit for foreground dispatch.
2011-02-08 19:33:53 -08:00
Jeff Hamilton
c9cda41f02 Merge "Improve the docs a bit for foreground dispatch." into gingerbread 2011-02-08 19:30:47 -08:00
Eric Fischer
b5c24f2871 am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'be4b39d2fde3d34539752b99238ceebd97ccf580':
  Import revised translations.  DO NOT MERGE
2011-02-08 17:32:18 -08:00
Scott Main
ace630d9c1 am 3c01a139: rename SIP doc title
* commit '3c01a139f0d8ece0e300be26ac41280f1e934747':
  rename SIP doc title
2011-02-08 17:32:14 -08:00
Scott Main
a12ed5ec38 am c442bc60: docs: move the SIP guide into guide/network/
* commit 'c442bc605c80a2900a0ed41345f53d218288de7a':
  docs: move the SIP guide into guide/network/
2011-02-08 17:32:06 -08:00
Katie McCormick
5ffcfb88f0 am 7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
* commit '7134520b2635474c5e7f4902c26e12d0ffcc9c64':
  cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API
2011-02-08 17:31:59 -08:00
Dirk Dougherty
1e6e960d66 am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread
* commit '01967c0ee104e985167374e41f2c416c1100f767':
  Doc change: Add diff report for api 10.
2011-02-08 17:31:54 -08:00
Gilles Debunne
2f630a5533 am cdfe8999: Fix for multiple merge problem.
* commit 'cdfe899991c365d9e197d83f8859089cae082011':
  Fix for multiple merge problem.
2011-02-08 17:31:33 -08:00
Gilles Debunne
a8b288d285 resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp
Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
2011-02-08 16:33:58 -08:00
Eric Fischer
021223d742 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-02-08 10:00:24 -08:00
Dirk Dougherty
88902d0549 Merge "Doc change: Add diff report for api 10." into gingerbread 2011-02-07 17:21:56 -08:00
Brad Fitzpatrick
a9bc4da260 am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit 'b901c9abff6b3885e1efce2e643b1f8e5ef3fc79':
  Fix a race condition in NativeDaemonConnector
2011-02-07 10:07:46 -08:00
Brad Fitzpatrick
16cd26a9cd am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"
* commit '9204644d9e8fc2a3d05ff386b14b349f7a117694':
  Fix a race condition in NativeDaemonConnector
2011-02-07 10:04:54 -08:00
Brad Fitzpatrick
d9d203315c Merge "Fix a race condition in NativeDaemonConnector" 2011-02-07 09:55:34 -08:00
Dianne Hackborn
b68bef3b70 am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition."
* commit '4b7c1cacca252f735d23f7e01885214630d83f32':
  Fixing possible race condition.
2011-02-07 07:51:34 -08:00
Dianne Hackborn
6de8529af6 am bb2e1ef8: Merge "Fixing possible race condition."
* commit 'bb2e1ef87fe4c5123340035766c759155e6bb90c':
  Fixing possible race condition.
2011-02-07 07:33:38 -08:00
Dianne Hackborn
8fb929bcb1 Merge "Fixing possible race condition." 2011-02-06 09:06:35 -08:00
Kenny Root
4cb99b4ab6 am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings."
* commit 'd2a996173e53e7b38ff9b703cc5986d9715508a1':
  JPtextinput: Dont break emoji characters when cutting strings.
2011-02-04 16:12:14 -08:00